Modified wrap to fix with header and footer