Regrouping and reorganising the settings