Updating some page templates and views to polish things up