Refined split-view demo code.
Merge branch 'master' into dev