Added map to the edit screen also