formatting navbar
Merge branch 'master' into blog