Reworked the basics of the Toolbar, off by default