I’ve been a bit fed up and grumpy today, so I’ve been putting this off. I have, however, decided now that I need to tackle the problem head on:

Sorted.