created a partial for nav
corrected merge conflicts
fix conflicts
Merge pull request #16 from ballauriena/tweaks

Tweaks