CollapseToggle moves to uitools; camelCase
Locator export uses setPicker