Tweeking UI validation