Layout and form validation improvements