Just fucking revert the UI at this point. It's a disaster on macOS.