re-organized settings