Refactoring the UI for simplicity/clarity.

A few markup tweaks and some CSS.