Added correct header and footer layout