Refactored Menus, added code