Move toolbar to widget. Show it early. Ref #224