More issues. Fix toolbars bug from Bruno.