General updates. Moved site validations to custom