Rejig settings, allow reset