Gadget update
Cleanup.  Number spinner.