Added main menu and various other changes