Updated the views and template tags to make use of the new page templates.