Updated pickup/drop, UI