moved header and footer to proper locations