Validation updates to Controller and View