UI validation fixes!