Merge pull request #10 from daven009/master

Updates & Fixes
fix navbar
Update & Merge