Cleanup and view layout form validation changes