Fixed some styling issues with the navbar margin
Merge branch 'master' into production