GCP-7675 Dialog Box for Choose Location + other fixes