better menu and map