Refactor layout
Layout Footer better