Add navbar
Merge branch 'nicholas/navbar'
Adding navbar