Toolbar2

This is the followup for #895 by @shaina7837 - rebased against current master branch.