Merge pull request #15 from Waterfox/David

Started implementing extending templates in several pages (all tested) p...
Added templates to settingses. 5 minutes.