Merge "Minor changes in Settings"