preview template improvements