Make the UI at least slightly more usable

See commits for actual changes.