Finished updating all pages to use the new template system