[#83699956] Overlay UI cleanup