Rearranged some of the CSS; must still fix the header