iteration 4 changes for map, ui etc