Fix form-control
clean up form-control