Added validation rules
Updated views