Fixed GA (wasn't being renered) + extracted it to partial.