Part 1 of 2 fixing the CSS mess, at least I think