better layout - working...
relayout
conflic resolved
layerify
fix some styles on map
layerify
Merge branch 'refactor/layout' into develop

* refactor/layout:
  layerify
  fix some styles on map
  layerify
  relayout
  better layout - working...
working on it