Template fixes

keeping it cool