To address the UI review comment