Fixed draggable icons, removed old code