added locations to choose from...still bug on first launch
Merge remote-tracking branch 'origin'
removed first lunch bug