added basic validations
updated views