Merge pull request #134 from sn0opy/master

added missing template + fixed settings page
fixed the related page