Better integration of the setting pages.