Merge pull request #1 from theslip/master

Merging changes for navbar
Fixed navbar scroll, style changes
Merge pull request #2 from morganmccol/master

Merge changes to navbar