Overall Template Improvements

I CAN HAZ DEM COMMITS