UI clean-up + google analytics