Buttons in sensible place on main menu, top button now navigates