Improved layout: header and footer