Add header and footer tags to template; rearrange WAVE