Re-work drop (gui.py)