update and refactor GA code, some modifications to site content