moved GA out of base template, retabbed