LPS-39357 Improve the accessibility of the control panel