Consolidate the two full-width page/post templates into one