reorganising of JS and detailed GA events