No point having head and foot as includes
Tidy up templates and includes