Fixed a few missing bits from the merge.  Also revert back to using toolbars.