Made settings conform to UI guidelines