Added layout validations and updated file validations.