Layout refactoring

Preparing to add extra sections.