Included validations in UI