Restructure some titles and sections