Add validations
Improve view looks