Header swap and footer changes