improving form templates