Moving template files around to be more organised. Updated the error pages to include the correct headers
Adding some useful annotations