System Status UI Improvement Patch

Patches for #6290 :smile: