Some UI and Cleanup
Gadget images sortable