UI touch-ups
[#25]