Changes to menu logic for better structure