Further tweaks to the form