Updated template pages

Updated existing pages and added several new ones