fixed maps menu location bug
Merge remote-tracking branch 'origin/Joel'