Reorder sections, improves font and styling