Improve menu and menu controls