Merge branch 'master' into esegev
Tweaks to navbar

Still need to keep tweaking
Merge branch 'esegev'