Fixed validators bugs. UI fixed