Re-check template layout

After creating some pages, I noticed that the current template does not really put the components into place. Therefor, we need to recheck the layout.

This issue belongs to #1 (closed)