Started refactor of main menu