Added UI validations