Changed templates to use individual page widgets