Tweaks before demo

Just a few tweaks to prepare for the demo. Mostly around cleaning up
the HTML and layout.