Changed some headings, consolidate CSS