LPS-35333 UI Fixing