Improvements to demo layout/behavior.