Menu Refactoring/Additions