Update google analytics
Refactor css and js