Fixes to outline view (as requested by Tom/Rob)