Big rework on settings