working on map and layout