Layout changes, form validation