Started refactoring of GUI main menu