made a few change to the form and view