Futzed a little with layout, and some presentation data