map and navbar
Merge pull request #11 from maiahariton/master

map and navbar