* Added validation and update UI