fixed the overlapping "enable location tracking" checkbox
Merge remote-tracking branch 'origin/master'