Design tweaks

Just some design/UI tweaks to improve overall display/behaviour. Could be reviewed and merged now; I'm not sure I have anything major to add just yet!