New UI validation behavior.
Small refactoring.