Added main menu and button types