ui validation fixes