Improve order of some topics.