UI Overhaul - Part 2

Second of the UI changes for version 1.1