Updated navbar
Merge branch 'master' into kh-search