Validations Changes

Validations and Design Changes