Minor tweaks to forms