fix proper div nesting for expandable / expanded divs; also use broker specific class names just in case