Updated template files for frontpage and page