Fixed UI validations