Improved settings controller.