Added a main menu and improved the main