Various enhancements to forms and layout