Changes to the form so that it works better