Adding in the map display and more