Fix section titles and order