Initial form code
Improving form