Integrating feedback from Fergus on the first round of changes. Some other minor tweaks to visual layout.