Agreed, this was something I brought up to @wryobservations. Which was why I added the "UI work" needed comment on the PR.