UI updates defect fix