Add GA correctly and remove buttons