[#83699956] Overlay UI cleanup

Specs pass locally (Semaphore is down)

https://basecamp.com/1931459/projects/2331079/messages/34489200