refactor toolbars to be separate objects - issue #123