Moved around some of the styling into higher level elements.  Also
fixed the content width at 600px.