Fix locations displaying in edit activities

fixes #7692
Edit pickup layout changes