Updated Settings

More more organize