Minor changes in templates and styles