added avatar support to switcher templates