Dexterity/Toolbar integration wip
Update toobar specific branch
Small reules update wip