add GA
fix templates problem