Moved some menus around