Modify layout
Reorg; add footer