Cleaned up the template files
Neater template shizzle