Updated settings to be consistent with iOS
Formatting