Improving form template