messing with maps - WIP
css refactoring
Merge branch 'master' into feature
cleaning up issues