Some minor changes in templates and settings