Fixes #7491 - moved default org and default location to same tab as org/...

...loc selection
Changed the labels.