HTML aside had to be moved to help with source order. Lots of adjustments after the aside was moved.

I'm still working on this.