few tweaks to forms