Layout and usability improvements