Added additional data and tweaked the layout a bit.