Change toolbar into replacement for ui/ui, map ui/ui to toolbar

This avoids having to monkey-patch ui.adopt, which in turn avoids a race condition.