A bit more work on the demo/collapse pane