fixed validation for form submit + layout