Minor changes to templates

- Change navigation menu
- Clean up footer include
Remove margin specifications from <h1> etc