Fixes in relation to #128
Org overview tidyup