Started work on condensing templates
Cleaned up loads of markup, and made things reusable