Rework global toolbar menus