Fixup Templates and Views