[#68] Adds a load of UI tweaks
Merge branch '68-ui-tweaks'