OZP-60: Dragndrop improvements and fixes