Refactored the application main menu