Workbench subwidgets

Re-opening the PR for this topic since old merge was reverted