Fixing merge conflict.
Navbar cleanup.
Merge pull request #68 from lisafrench/master

Nav bar cleanup
Merge pull request #69 from eleather/master

Fix map rendering