grouping js to relevant gadget
grouping js to relevant gadgets
bugfix