Updated form templates