Remove double var declaration
Each toolbar is in charge of displaying itself now.
Auto instantiate toolbars
Merge branch 'decouple_toolbars'