Improved layout and menu