changes to Settings menu to avoid merge conflict