Rearrangement of the content to be more logical