Fixed hardcoded collection gadgetID.
Some cleanup.