Updated views and started validations