tweak(settings): switch menu order
Merge pull request #1705 from mozilla/issue-1702

tweak(settings): switch menu order r=vladikoff