Fixes to form layout and form fields.