Some map and css changes