diff --git a/html/admin/css/layout.css b/html/admin/css/layout.css
index 076f89d991..6d0dd773cf 100644
--- a/html/admin/css/layout.css
+++ b/html/admin/css/layout.css
@@ -1,3 +1,5 @@
+
+
 .jediTextarea textarea {
   border: solid 1px #525252; 
   background-color: #F3F1EE; 
@@ -395,14 +397,14 @@ form {
 }
 
 #formatJSONyesno {
-  margin-top: -40px;  
+  margin-top: -50px;  
   float:right; 
   margin-right: 120px;  
   color: #797979;
 }
 
 #aqlinfo {
-  line-height: 150%;     
+  line-height: 250%;     
 }
 
 #submitQuery {
@@ -411,18 +413,25 @@ form {
 }
 #refreshShell{
   padding-bottom: 3px;
-  margin-top: -10px;  
+  margin-top: -6px;  
   width: 9.5% !important;
 }
 
 #queryOutput a, .queryError, .querySuccess {
   font-size: 0.9em !important; 
-  font-family: "courier"; 
+  font-family: "courier";
+  padding-left: 10px;  
+  padding-top: 10px !important;  
 }
 
+#queryOutput pre {
+  padding-left: 10px; 
+  padding-top: 10px;  
+}
 
 #queryOutput {
   height:35%; 
+  padding-top: 10px;  
   overflow-y: auto; 
   border: 1px solid black;
   background: white;  
@@ -435,7 +444,9 @@ form {
   height: 45%; 
   font-family: "courier";
   width: 100%;
-  resize: vertical; 
+  resize: vertical;
+  padding-top: 10px;  
+  padding-left: 10px; 
 }
 
 #avocshWindow {
@@ -674,6 +685,11 @@ form {
 #logTableID_info {
 }
 
+#logTableID, #warnLogTableID, #critLogTableID, #infoLogTableID, #debugLogTableID {
+  border-left: 1px solid #AAAAAA;
+  border-right: 1px solid #AAAAAA;
+}
+
 .ui-dialog {
   height:100px; 
   font-size: 0.8em;  
@@ -777,9 +793,9 @@ form {
 #avocshView button, #queryView button, #tab_right button, #footerSlideContent button, form.jediTextarea > button  {
   background: #e3e3e3;
   border: 1px solid #bbb;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
+  -webkit-border-radius: 1px;
+  -moz-border-radius: 1px;
+  border-radius: 1px;
   -webkit-box-shadow: inset 0 0 1px 1px #f6f6f6;
   -moz-box-shadow: inset 0 0 1px 1px #f6f6f6;
   box-shadow: inset 0 0 1px 1px #f6f6f6;
@@ -813,3 +829,42 @@ form {
 #iInfo {
   font-size: 0.8em; 
 }
+
+#shellInfo {
+  line-height: 200%; 
+}
+
+#formatJSONyesno {
+  padding-top: 5px !important
+}
+
+@media screen 
+  and (-webkit-min-device-pixel-ratio:0)
+{
+  #submitAvoc {
+    padding-top: 4px !important; 
+    height: 30px !important;  
+  }
+
+  #refreshShell {
+    margin-top: -4px !important;  
+    margin-right: 2px !important; 
+  }
+
+  #refrehShellTextRefresh {
+    line-height:230% !important; 
+  }
+
+  #formatshellJSONyesno {
+    padding-top: 5px; 
+  }
+}
+
+.leftCell {
+  border-left: 1px solid #AAAAAA !important;
+}
+
+.rightCell {
+  border-right: 1px solid #AAAAAA !important;
+}
+
diff --git a/html/admin/index.html b/html/admin/index.html
index 4199fbef78..7b06797df4 100644
--- a/html/admin/index.html
+++ b/html/admin/index.html
@@ -50,7 +50,7 @@
         <button class="minimal" id="Query">Query</button>
         <button class="minimal" id="AvocSH">Shell</button>
         <button class="minimal" id="Logs">Logs</button>
-        <a href="http://www.arangodb.org/manuals/" target="_blank"><button class="minimal" id="Documentation">Documentation</button></a>
+        <a href="http://www.arangodb.org/manuals/current/" target="_blank"><button class="minimal" id="Documentation">Documentation</button></a>
       </div>
 
     </div>
@@ -410,25 +410,25 @@
         <form>
           <input type="text" class="editBox" id="avocshContent"></input><button class="minimal" id="submitAvoc">Ok</button>
         </form>
-          <button class="minimal" id="refreshShell">Refresh</button>
+          <button class="minimal" id="refreshShell"><a id="refrehShellTextRefresh">Refresh</a></button>
             <form action="#" id="formatshellJSONyesno" style="font-size:0.8em;">
               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" style="font-size:0.8em">ArangoDB Shell - click for more information</a>
+          <a id="shellInfo" href="http://www.arangodb.org/manuals/current/UserManualArangosh.html" target="_blank" style="font-size:0.8em">ArangoDB Shell - click for more information</a>
       </div>
 
       <div id="queryView" style="display: none">
         <a style="color:#797979; font-size:0.9em;">Output:</a>
         <div id="queryOutput">
-          <a style="padding-left:10px">Please enter your query in the box below</a>
+          <a style="padding-left:10px;">Please enter your query in the box below</a>
         </div>
         <a style="color:#797979; font-size:0.9em;">Input:</a>
         <form id="queryForm" method="post" onsubmit="return false">
           <textarea placeholder="Type in your query..." class="editBox" id="queryContent"></textarea><br>
           <button class="minimal" id="submitQuery">Execute</button>
-          <a style="font-size:0.8em;" id="aqlinfo" href="http://www.arangodb.org/manuals/Aql.html" target="_blank">ArangoDB Query Language - click for more information</a>
+          <a style="font-size:0.8em;" id="aqlinfo" href="http://www.arangodb.org/manuals/current/Aql.html" target="_blank">ArangoDB Query Language - click for more information</a>
         <br></br>
         </form>   
         <form action="#" id="formatJSONyesno" style="font-size:0.8em;">
diff --git a/html/admin/js/master.js b/html/admin/js/master.js
index dda1dd6052..7d1f953a70 100644
--- a/html/admin/js/master.js
+++ b/html/admin/js/master.js
@@ -167,7 +167,7 @@ var collectionTable = $('#collectionsTableID').dataTable({
     "bAutoWidth": false, 
     "iDisplayLength": -1, 
     "bJQueryUI": true, 
-    "aoColumns": [{"sWidth":"150px", "bSortable":false}, {"sWidth": "200px"}, {"sWidth": "200px"}, null, {"sWidth": "200px"}, {"sWidth": "200px"} ],
+    "aoColumns": [{"sWidth":"150px", "bSortable":false, "sClass":"leftCell"}, {"sWidth": "200px"}, {"sWidth": "200px"}, null, {"sWidth": "200px"}, {"sWidth": "200px", "sClass":"rightCell"} ],
     "aoColumnDefs": [{ "sClass": "alignRight", "aTargets": [ 4, 5 ] }],
     "oLanguage": {"sEmptyTable": "No collections"}
 });
@@ -186,9 +186,9 @@ var documentEditTable = $('#documentEditTableID').dataTable({
     "bDeferRender": true, 
     "iDisplayLength": -1, 
     "bJQueryUI": true, 
-    "aoColumns": [{"sClass":"read_only", "bSortable": false, "sWidth": "30px"}, 
+    "aoColumns": [{"sClass":"read_only leftCell", "bSortable": false, "sWidth": "30px"}, 
                   {"sClass":"writeable", "bSortable": false, "sWidth":"400px" }, 
-                  {"sClass":"writeable", "bSortable": false},
+                  {"sClass":"writeable rightCell", "bSortable": false},
                   {"bVisible": false } ], 
     "oLanguage": {"sEmptyTable": "No documents"}
 });
@@ -206,9 +206,9 @@ var newDocumentTable = $('#NewDocumentTableID').dataTable({
     "bAutoWidth": true, 
     "iDisplayLength": -1, 
     "bJQueryUI": true, 
-    "aoColumns": [{ "sClass":"center", "sClass":"read_only","bSortable": false, "sWidth": "30px"}, 
+    "aoColumns": [{"sClass":"read_only center leftCell","bSortable": false, "sWidth": "30px"}, 
                   {"sClass":"writeable", "bSortable": false, "sWidth":"250px" }, 
-                  {"sClass":"writeable", "bSortable": false },
+                  {"sClass":"writeable rightCell", "bSortable": false },
                   {"bVisible": false } ] 
   });
 
@@ -225,10 +225,10 @@ var documentsTable = $('#documentsTableID').dataTable({
     "bAutoWidth": false, 
     "iDisplayLength": -1, 
     "bJQueryUI": true, 
-    "aoColumns": [{ "sClass":"read_only", "bSortable": false, "sWidth":"80px"}, 
+    "aoColumns": [{ "sClass":"read_only leftCell", "bSortable": false, "sWidth":"80px"}, 
                  { "sClass":"read_only","bSortable": false, "sWidth": "200px"}, 
                  { "sClass":"read_only","bSortable": false, "sWidth": "100px"},  
-                 { "bSortable": false, "sClass": "cuttedContent"}],
+                 { "bSortable": false, "sClass": "cuttedContent rightCell"}],
     "oLanguage": { "sEmptyTable": "No documents"}
   });
 
@@ -437,10 +437,10 @@ var logTable = $('#logTableID').dataTable({
           $('#documentEditSourceView').hide();
           $.each(data, function(key, val) {
             if (key == '_id') {
-              documentEditTable.fnAddData(["", key, val, JSON.stringify(val)]);
+              documentEditTable.fnAddData(["&nbsp;", key, val, JSON.stringify(val)]);
             }
             else if (key == '_rev') {
-              documentEditTable.fnAddData(["", key, val, JSON.stringify(val)]);
+              documentEditTable.fnAddData(["&nbsp;", key, val, JSON.stringify(val)]);
             }
             else if (key != '_rev' && key != '_id') {
               documentEditTable.fnAddData(['<button class="enabled" id="deleteEditedDocButton"><img src="/_admin/html/media/icons/delete_icon16.png" width="16" height="16"></button>',key, value2html(val), JSON.stringify(val)]);
@@ -1637,7 +1637,7 @@ function drawCollectionsTable () {
       else if (tempStatus == 2) {
         tempStatus = "<font color=orange>unloaded</font>";
         items.push(['<button class="enabled" id="delete"><img src="/_admin/html/media/icons/round_minus_icon16.png" width="16" height="16"></button><button class="enabled" id="load"><img src="/_admin/html/media/icons/connect_icon16.png" width="16" height="16"></button><button><img src="/_admin/html/media/icons/zoom_icon16_nofunction.png" width="16" height="16" class="nofunction"></img></button><button><img src="/_admin/html/media/icons/doc_edit_icon16_nofunction.png" width="16" height="16" class="nofunction"></img></button>', 
-        val.id, val.name, tempStatus, "", ""]);
+        val.id, val.name, tempStatus, "-", "-"]);
        }
       else if (tempStatus == 3) {
         tempStatus = "<font color=green>loaded</font>";