added validations, cleaning views