Template Improvements

Various Improvements to templates