Organized the menus a bit