diff --git a/src/static/css/admin.css b/src/static/css/admin.css
index 33ec5710..f60548fc 100644
--- a/src/static/css/admin.css
+++ b/src/static/css/admin.css
@@ -146,6 +146,11 @@ a:focus, a:hover {
   border-bottom: #333333 1px solid;
 }
 
+pre {
+  white-space: pre-wrap;
+  word-wrap: break-word;
+}
+
 @media (max-width: 720px) {
   div.innerwrapper {
     padding: 0 15px 15px 15px;
diff --git a/src/templates/admin/settings.html b/src/templates/admin/settings.html
index 759752ea..4476b733 100644
--- a/src/templates/admin/settings.html
+++ b/src/templates/admin/settings.html
@@ -35,12 +35,14 @@
       </div>
 
       <div class="innerwrapper">
-        <a href='https://github.com/ether/etherpad-lite/wiki/Example-Production-Settings.JSON'>Example production settings template</a>
-        <a href='https://github.com/ether/etherpad-lite/wiki/Example-Development-Settings.JSON'>Example development settings template</a>
+        <h2>Current configuration</h2>
         <textarea class="settings"></textarea>
         <input type="button" class="settingsButton" id="saveSettings" value="Save Settings">
         <input type="button" class="settingsButton" id="restartEtherpad" value="Restart Etherpad">
         <div id="response"></div>
+        <div class="separator"></div>
+        <a href='https://github.com/ether/etherpad-lite/wiki/Example-Production-Settings.JSON'>Example production settings template</a>
+        <a href='https://github.com/ether/etherpad-lite/wiki/Example-Development-Settings.JSON'>Example development settings template</a>
       </div>
     </div>
   </body>