Change the level of headings

This is not at all a complete rework, but with time...