Added map to menu and UI Changes