Massive template cleanup to make all the pages look reasonably consistent.