Fixes to layout for better usability and design