Tinkered with the Toolbar class