Move header and footer to common location