Rearranges some CSS to try and validate correctly w/W3C