Move the navigation links into the title and footer
Bring code in line with coding guidelines
Improvements to the manual design
Merge pull request #291 from timschofield/develop

Develop