Refactored and restructured menus