Couple of style tweaks, and a layout fix.
Merge branch 'staging' of github.com:sunlightlabs/tcamp into staging