Initial fixes to get the Edit Pickup1 to display