Fixed margin bug coming back from map view. Also added 2 automatic hiding of map view.