some changes on templates and switcher modules