More changes to the heading spacing. Good first draft...