Update settings.py

Grouped and added a larger set of settings