Making some minor changes in the form