Code tidying and UI tweaks

Mostly a bunch of code tidying and UI tweakage, cleaning up the evidence that this started life as a quick hack one evening. While it's not much more than a quick hack still, at least it's a tidy one now and can be built on.