Changing templates to work with the new cleaner pages array / filtering process...