UI tweaks to follor the mockup more closely