Merged the menu and master class