fixed awkward nav zoom
Merge branch 'master' into hotfix/bootstrap-scaffolding
Merge branch 'master' into feature/navmenu