Added Added new form control
Fixed form layout