Massive update to the Toolbar class