Clean up the layout, fix the other header.
Wasn't quite ready to do that.