Settings controller changes