Various layout-related tweaks to the demo.