Continue refactoring the menu