Some adjustments to the form contents