Adjust the form per @ralphbean advices