Improve page template switch from Responsive v2.0