Added navbar.
Merge pull request #9 from gkadillak/garrett-branch

Added navbar.
fixed merge confilcts