More settings rework