fix the menu items and work on map