rearanging map UI, full screen map - towards #145
Merge branch 'rearange-map'