Fix the manage location / manage method for the import and to avoid the double scroll bar

Reviewer: Cy Casada

Issue: GCP-9754, GCP-9755