improved settings organization