added validations
cleaned up views