Further work on desklets (3)

Rebased + incorporated better DND fix by Lusito

Ready for merge