Revert "Sonar failsafe UI"

This reverts commit 3c3f2f7e9e3ebb0639731e0895ac5411da498c6c.
Revert "Revert "Sonar failsafe UI""

This reverts commit a92c371121b2102bc2c38b819f569cb5043897bd.
OSD Improvements
same