Fixed the navbar
Merge branch 'andrews'
Close #6