More pickup ui modifications