Improved the MapScreen and SearchScreen UI.