Improve order of contents