Reworked the separation between content and the page