form template improvements