Map ui/ui to toolbar for the same change in Aloha: to avoid monkey-patch and race condition