Made the gadget smaller and fixed crash at object disposal