Added the map and basic layout