Reorganized Menus

Still needs refactored for clarity