More template improvements'