Renamed menu and fixed