Small changes to template and tidying up settings file