Fixing minor bug and improving google analytics