layout changes probably similar to master
uncommented validations