Ok, not quite final but hopefully this is it - final tweaks to Org association box.