UI defect fixes