Updated form template helper