improve gadgets system