Some more tweaks on the forms