More work on drop/dodge UI. Refs #8