3 files changed, 24 insertions, 26 deletions
diff --git a/debug_toolbar/panels/settings_vars.py b/debug_toolbar/panels/settings_vars.py
index db0ea1d..e090718 100644
--- a/debug_toolbar/panels/settings_vars.py
+++ b/debug_toolbar/panels/settings_vars.py
@@ -1,7 +1,7 @@
-from django.template.loader import render_to_string
-from debug_toolbar.panels import DebugPanel
 from django.conf import settings
+from django.template.loader import render_to_string
 from django.views.debug import get_safe_settings
+from debug_toolbar.panels import DebugPanel
 
 class SettingsVarsDebugPanel(DebugPanel):
     """
@@ -11,15 +11,13 @@ class SettingsVarsDebugPanel(DebugPanel):
     has_content = True
 
     def title(self):
-        return 'Settings Vars'
+        return 'Settings'
 
     def url(self):
         return ''
 
     def content(self):
-        import logging
-        settings_dict = get_safe_settings()
         context = {
-            'settings': settings_dict,
+            'settings': get_safe_settings(),
         }
-        return render_to_string('debug_toolbar/panels/settings_vars.html', context)
-\ No newline at end of file
+        return render_to_string('debug_toolbar/panels/settings_vars.html', context)
diff --git a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
index b139a43..f1e6684 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
@@ -1,18 +1,17 @@
-<h3 id="settings-info">Settings</h3>
-<h4>Using settings module <code>{{ settings.SETTINGS_MODULE }}</code></h4>
-<table class="req">
-  <thead>
-    <tr>
-      <th>Setting</th>
-      <th>Value</th>
-    </tr>
-  </thead>
-  <tbody>
-    {% for var in settings.items|dictsort:"0" %}
-      <tr>
-        <td>{{ var.0 }}</td>
-        <td class="code"><div>{{ var.1|pprint }}</div></td>
-      </tr>
-    {% endfor %}
-  </tbody>
-</table>
-\ No newline at end of file
+<h3>Settings from <code>{{ settings.SETTINGS_MODULE }}</code></h3>
+<table>
+	<thead>
+		<tr>
+			<th>Setting</th>
+			<th>Value</th>
+		</tr>
+	</thead>
+	<tbody>
+		{% for var in settings.items|dictsort:"0" %}
+			<tr>
+				<td>{{ var.0 }}</td>
+				<td><code>{{ var.1|pprint }}</code></td>
+			</tr>
+		{% endfor %}
+	</tbody>
+</table>
diff --git a/debug_toolbar/toolbar/loader.py b/debug_toolbar/toolbar/loader.py
index 29ab46e..b217665 100644
--- a/debug_toolbar/toolbar/loader.py
+++ b/debug_toolbar/toolbar/loader.py
@@ -15,11 +15,12 @@ class DebugToolbar(object):
         self.default_panels = (
             'debug_toolbar.panels.version.VersionDebugPanel',
             'debug_toolbar.panels.timer.TimerDebugPanel',
+            'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
             'debug_toolbar.panels.headers.HeaderDebugPanel',
             'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
+            'debug_toolbar.panels.template.TemplateDebugPanel',
             'debug_toolbar.panels.sql.SQLDebugPanel',
             'debug_toolbar.panels.cache.CacheDebugPanel',
-            'debug_toolbar.panels.template.TemplateDebugPanel',
             'debug_toolbar.panels.logger.LoggingPanel',
         )
         self.load_panels()