Fixes navbar to top
Merge branch 'master' into production