diff --git a/html/admin/css/layout.css b/html/admin/css/layout.css
index b3c0437ed8..364e9a553e 100644
--- a/html/admin/css/layout.css
+++ b/html/admin/css/layout.css
@@ -7,8 +7,8 @@
 }
 
 .writeable {
-  width: 100%; 
   word-wrap: break-word; 
+  width:auto !important;   
 }
 
 #delete {
@@ -346,6 +346,13 @@ form {
   float:right;
 }
 
+#formatshellJSONyesno {
+  float:right; 
+  padding-right:10px; 
+  margin-top: -3px; 
+  color: #797979;
+}
+
 #formatJSONyesno {
   margin-top: -40px;  
   float:right; 
@@ -654,7 +661,7 @@ form {
   line-height: 1;
   text-align: center;
   text-shadow: 0 1px 0 #fff;
-  width: 80px;
+  width: 90px;
 }
 #menue button.minimal:hover {
     background: #d9d9d9;
diff --git a/html/admin/index.html b/html/admin/index.html
index 077927d953..3d5d70e506 100644
--- a/html/admin/index.html
+++ b/html/admin/index.html
@@ -397,6 +397,11 @@
           <input type="text" class="editBox" id="avocshContent"></input><button class="minimal" id="submitAvoc">Ok</button>
         </form>
           <button class="minimal" id="refreshShell">Refresh</button>
+            <form action="#" id="formatshellJSONyesno">
+              Format JSON? 
+              <input type="radio" name="formatshellJSONyesno" value=true checked>yes</input>
+              <input type="radio" name="formatshellJSONyesno" value=false>no</input>
+            </form>
           <a href="http://www.arangodb.org/manuals/UserManual.html" target="_blank">ArangoDB Shell - click for more information</a>
       </div>
 
@@ -410,12 +415,11 @@
           <a id="aqlinfo" href="http://www.arangodb.org/manuals/Aql.html" target="_blank">ArangoDB Query Language - click for more information</a>
         <br></br>
         </form>   
-            <form action="#" id="formatJSONyesno">
-              Format JSON? 
-              <input type="radio" name="formatJSONyesno" value=true checked>yes</input>
-              <input type="radio" name="formatJSONyesno" value=false>no</input>
-            </form>
-
+        <form action="#" id="formatJSONyesno">
+          Format JSON? 
+          <input type="radio" name="formatJSONyesno" value=true checked>yes</input>
+          <input type="radio" name="formatJSONyesno" value=false>no</input>
+        </form>
       </div>
 
     </div> 
diff --git a/html/admin/js/master.js b/html/admin/js/master.js
index 5106041946..33b79e565c 100644
--- a/html/admin/js/master.js
+++ b/html/admin/js/master.js
@@ -160,7 +160,7 @@ var collectionTable = $('#collectionsTableID').dataTable({
     "bAutoWidth": false, 
     "iDisplayLength": -1, 
     "bJQueryUI": true, 
-    "aoColumns": [{"sWidth":"120px", "bSortable":false}, {"sWidth": "200px"}, {"sWidth": "200px"}, {"sWidth": "200px"}, {"sWidth": "200px"}, null ],
+    "aoColumns": [{"sWidth":"150px", "bSortable":false}, {"sWidth": "200px"}, {"sWidth": "200px"}, null, {"sWidth": "200px"}, {"sWidth": "200px"} ],
     "aoColumnDefs": [{ "sClass": "alignRight", "aTargets": [ 4, 5 ] }],
     "oLanguage": {"sEmptyTable": "No collections"}
 });
@@ -176,12 +176,11 @@ var documentEditTable = $('#documentEditTableID').dataTable({
     "bSortable": false,
     "bLengthChange": false, 
     "bDeferRender": true, 
-    "bAutoWidth": true, 
     "iDisplayLength": -1, 
     "bJQueryUI": true, 
     "aoColumns": [{ "sClass":"center", "sClass":"read_only","bSortable": false, "sWidth": "30px"}, 
-                  {"sClass":"writeable", "bSortable": false, "sWidth":"250px" }, 
-                  {"sClass":"writeable", "bSortable": false },
+                  {"sClass":"writeable", "bSortable": false, "sWidth":"300px" }, 
+                  {"sClass":"writeable", "bSortable": false},
                   {"bVisible": false } ], 
     "oLanguage": {"sEmptyTable": "No documents"}
 });
@@ -218,7 +217,7 @@ var documentsTable = $('#documentsTableID').dataTable({
     "bAutoWidth": true, 
     "iDisplayLength": -1, 
     "bJQueryUI": true, 
-    "aoColumns": [{ "sClass":"center", "sClass":"read_only","bSortable": false, "sWidth": "70px"}, 
+    "aoColumns": [{ "sClass":"read_only","bSortable": false, "sWidth": "80px"}, 
                   {"sClass":"read_only","bSortable": false, "sWidth": "125px"}, 
                   {"sClass":"read_only","bSortable": false, "sWidth": "60px"}, 
                   {"bSortable": false}],
@@ -716,8 +715,9 @@ var logTable = $('#logTableID').dataTable({
       createnav ("ArangoDB Shell"); 
       $('#avocshContent').focus();
       if (printedHelp === false) {
-        print(welcomeMSG + HELP);
+        print(welcomeMSG + require("arangosh").HELP);
         printedHelp = true; 
+        start_pretty_print(); 
       }
     }
 
@@ -805,7 +805,6 @@ var logTable = $('#logTableID').dataTable({
         });
       }
       catch(e) {
-        console.log(e); 
         alert("Please make sure the entered value is a valid json string."); 
       }
     }
@@ -903,7 +902,6 @@ var logTable = $('#logTableID').dataTable({
         });
       }
       catch(e) {
-        console.log(e); 
         alert("Please make sure the entered value is a valid json string."); 
       }
     }
@@ -971,7 +969,6 @@ var logTable = $('#logTableID').dataTable({
       }
  
       catch(e) {
-        console.log(e); 
         alert("Please make sure the entered value is a valid json string."); 
       }
 
@@ -1185,6 +1182,8 @@ var logTable = $('#logTableID').dataTable({
 ///////////////////////////////////////////////////////////////////////////////
 /// submit avocsh content 
 ///////////////////////////////////////////////////////////////////////////////
+
+var lastFormatQuestion = true;  
  
  $('#submitAvoc').live('click', function () {
     var data = $('#avocshContent').val();
@@ -1196,7 +1195,17 @@ var logTable = $('#logTableID').dataTable({
        location.reload();
        return false;  
     }
-
+    formatQuestion = JSON.parse($('input:radio[name=formatshellJSONyesno]:checked').val());
+    if (formatQuestion != lastFormatQuestion) {
+      if (formatQuestion == true) {
+        start_pretty_print();
+        lastFormatQuestion = true;
+      } 
+      if (formatQuestion == false) {
+        stop_pretty_print(); 
+        lastFormatQuestion = false;
+      }
+    }
     var client = "arangosh> " + escapeHTML(data) + "<br>";
  
     $('#avocshWindow').append('<b class="avocshClient">' + client + '</b>');
@@ -1237,7 +1246,6 @@ var logTable = $('#logTableID').dataTable({
         }
       },
       error: function(data) {
-        console.log(data); 
         var temp = JSON.parse(data.responseText);
         $("#queryOutput").empty();
         $("#queryOutput").append('<a class="queryError"><font color=red>[' + temp.errorNum + '] ' + temp.errorMessage + '</font></a>'); 
@@ -1948,8 +1956,8 @@ function showCursor() {
 }
 
 function cutByResolution (string) {
-  if (string.length > 150) {
-    return escaped(string.substr(0, 150)) + '...';
+  if (string.length > 100) {
+    return escaped(string.substr(0, 100)) + '...';
   }
   return escaped(string);
 }
@@ -2237,7 +2245,6 @@ $('#submitDocPageInput').live('click', function () {
     }
     
     else { 
-      console.log("out of reach");
       return false; 
     }  
   }