Addressed UI review