Fixed problem with page titles and removed old template files