Lot's of UI tweaks

Fixes #51, #52 & #53