Fix D&D positioning and selection logic