Improve layout
Add footer