Redesigned and added more fluff to map view