Reorganized headers and standardized navbars
Merge branch 'dev' of https://github.com/motivate/motivate into dev