Layout refactoring (header, footer)