Lots of formatting work.

I have the asides structurally set, as well and the headings.