diff --git a/html/admin/css/layout.css b/html/admin/css/layout.css
index 93cd301b66..c1a543d2f5 100644
--- a/html/admin/css/layout.css
+++ b/html/admin/css/layout.css
@@ -1,5 +1,3 @@
-
-
 button {
   padding: 0; 
 }
@@ -70,9 +68,8 @@ html.busy, html.busy * {
 }
 
 html {
-  font-family: Verdana,Arial,sans-serif; 
+  font-family: verdana,arial,helvetica,geneva,sans-serif; 
   font-size: 1em;
-  min-width: 1024px;
 }
 tr {
   font-size: 0.8em; 
@@ -212,8 +209,8 @@ pre ul li span{
   box-shadow: inset 0 0 1px 1px #f6f6f6;
 }
 
-#createCollection, #refreshCollections {
-  font-size: 0.85em !important;  
+#createCollection, #refreshCollections, #addDocumentButton, #saveEditedDocButton, #saveNewDocButton, #addEditedDocRowButton, #toggleEditedDocButton, #addNewDocButton, #toggleNewDocButton {
+  font-size: 0.8em !important;  
 }
 
 #createCollectionView {
@@ -318,13 +315,18 @@ form {
 }
 
 #submitQuery {
-  height:34px !important;
+  height:30px !important;
   width: 100px !important;
   float:right; 
 }
 
 #queryOutput {
+  height:40%;
+  border: 1px solid black;  
+  margin-bottom: 7px;  
+  background-color:white;  
   font-family: "courier"; 
+  overflow-y: auto; 
 }
 
 #queryContent {
@@ -375,13 +377,14 @@ form {
 .avocshSuccess {
   font-family: "courier";
   background-color: #e4e9d2;
-  color: #335127; 
+  //color: #335127; 
+  color: black; 
 }
 
 .avocshError {
   font-family: "courier";
   background-color: #FFD8D8;  
-  color: red; 
+  color: black; 
 }
 
 .avocshClient {
@@ -656,7 +659,6 @@ form {
 }
 
 #queryView {
-  height: 350px;   
 }
 
 #avocshView {
@@ -705,3 +707,7 @@ form {
   width: 200px; 
   padding-top:3px; 
 }
+
+#iInfo {
+  font-size: 0.8em; 
+}
diff --git a/html/admin/index.html b/html/admin/index.html
index 2e63a24d81..a86c8ca251 100644
--- a/html/admin/index.html
+++ b/html/admin/index.html
@@ -38,9 +38,6 @@
         <a href="/_admin/html/index.html"><img src="../html/media/images/arangodb_logo.png"></a>
       </div>
 
-      <div id="menue-center">
-      </div>
-
       <div id="menue-right">
         <button class="minimal" id="Collections">Collections</button>
         <button class="minimal" id="Logs">Logs</button>
@@ -278,11 +275,13 @@
               </thead>
             </table>
             <div id="logToolbar">
-                <button class="enabled" id="logTableID_first"><img src="/_admin/html/media/icons/rnd_br_first_icon16.png"></button>
-                <button class="enabled" id="logTableID_prev"><img src="/_admin/html/media/icons/rnd_br_prev_icon16.png"></button>
-                <button class="enabled" id="logTableID_next"><img src="/_admin/html/media/icons/rnd_br_next_icon16.png"></button>
-                <button class="enabled" id="logTableID_last"><img src="/_admin/html/media/icons/rnd_br_last_icon16.png"></button>
-                <a id="logTableID_status">Showing</a>
+             <div id="logToolbarAll">
+             <button class="enabled" id="logTableID_first"><img src="/_admin/html/media/icons/rnd_br_first_icon16.png"></button>
+             <button class="enabled" id="logTableID_prev"><img src="/_admin/html/media/icons/rnd_br_prev_icon16.png"></button>
+             <button class="enabled" id="logTableID_next"><img src="/_admin/html/media/icons/rnd_br_next_icon16.png"></button>
+             <button class="enabled" id="logTableID_last"><img src="/_admin/html/media/icons/rnd_br_last_icon16.png"></button>
+             </div>
+            <a id="logTableID_status">Showing</a>
             </div>
           </div>
 
@@ -296,11 +295,13 @@
               </thead>
             </table>
             <div id="logToolbar">
+             <div id="logToolbarCrit">
               <button class="enabled" id="critLogTableID_first"><img src="/_admin/html/media/icons/rnd_br_first_icon16.png"></button>
               <button class="enabled" id="critLogTableID_prev"><img src="/_admin/html/media/icons/rnd_br_prev_icon16.png"></button>
               <button class="enabled" id="critLogTableID_next"><img src="/_admin/html/media/icons/rnd_br_next_icon16.png"></button>
               <button class="enabled" id="critLogTableID_last"><img src="/_admin/html/media/icons/rnd_br_last_icon16.png"></button>
               <a id="critLogTableID_status">Showing</a>
+             </div>
             </div>
           </div>
         
@@ -314,10 +315,12 @@
               </thead>
             </table>
             <div id="logToolbar">
+             <div id="logToolbarWarn">
               <button class="enabled" id="warnLogTableID_first"><img src="/_admin/html/media/icons/rnd_br_first_icon16.png"></button>
               <button class="enabled" id="warnLogTableID_prev"><img src="/_admin/html/media/icons/rnd_br_prev_icon16.png"></button>
               <button class="enabled" id="warnLogTableID_next"><img src="/_admin/html/media/icons/rnd_br_next_icon16.png"></button>
               <button class="enabled" id="warnLogTableID_last"><img src="/_admin/html/media/icons/rnd_br_last_icon16.png"></button>
+              </div>
               <a id="warnLogTableID_status">Showing</a>
             </div>
           </div>
@@ -332,10 +335,12 @@
               </thead>
             </table>
             <div id="logToolbar">
+             <div id="logToolbarInfo">
               <button class="enabled" id="infoLogTableID_first"><img src="/_admin/html/media/icons/rnd_br_first_icon16.png"></button>
               <button class="enabled" id="infoLogTableID_prev"><img src="/_admin/html/media/icons/rnd_br_prev_icon16.png"></button>
               <button class="enabled" id="infoLogTableID_next"><img src="/_admin/html/media/icons/rnd_br_next_icon16.png"></button>
               <button class="enabled" id="infoLogTableID_last"><img src="/_admin/html/media/icons/rnd_br_last_icon16.png"></button>
+              </div>
               <a id="infoLogTableID_status">Showing</a>
             </div> 
           </div>
@@ -350,10 +355,12 @@
               </thead>
             </table>
             <div id="logToolbar">
+             <div id="logToolbarDebu">
               <button class="enabled" id="debugLogTableID_first"><img src="/_admin/html/media/icons/rnd_br_first_icon16.png"></button>
               <button class="enabled" id="debugLogTableID_prev"><img src="/_admin/html/media/icons/rnd_br_prev_icon16.png"></button>
               <button class="enabled" id="debugLogTableID_next"><img src="/_admin/html/media/icons/rnd_br_next_icon16.png"></button>
               <button class="enabled" id="debugLogTableID_last"><img src="/_admin/html/media/icons/rnd_br_last_icon16.png"></button>
+              </div>
               <a id="debugLogTableID_status">Showing</a>
             </div>
           </div>
@@ -384,12 +391,15 @@
       </div>
 
       <div id="queryView" style="display: none">
-        <form id="queryForm" method="post" onsubmit="return false">
-          <textarea class="editBox" id="queryContent"></textarea><br><button class="minimal" id="submitQuery">Post</button>
-        </form>   
-
         <div id="queryOutput">
         </div>
+        <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">Post</button>
+          <a href=https://github.com/triAGENS/ArangoDB/wiki/Aql>ArangoDB Query Language - click for more information</a>
+        <br></br>
+        </form>   
+
       </div>
 
     </div> 
diff --git a/html/admin/js/master.js b/html/admin/js/master.js
index 2bccc409c6..8acb7180fc 100644
--- a/html/admin/js/master.js
+++ b/html/admin/js/master.js
@@ -148,7 +148,7 @@ var collectionTable = $('#collectionsTableID').dataTable({
     "bAutoWidth": false, 
     "iDisplayLength": -1, 
     "bJQueryUI": true, 
-    "aoColumns": [{"sWidth":"100px", "bSortable":false}, {"sWidth": "200px"}, {"sWidth": "200px"}, {"sWidth": "200px"}, {"sWidth": "200px"}, null ],
+    "aoColumns": [{"sWidth":"120px", "bSortable":false}, {"sWidth": "200px"}, {"sWidth": "200px"}, {"sWidth": "200px"}, {"sWidth": "200px"}, null ],
     "oLanguage": {"sEmptyTable": "No collections"}
 });
 
@@ -1095,6 +1095,7 @@ var logTable = $('#logTableID').dataTable({
 
   $('#submitLogSearch').live('click', function () {  
 
+    hideLogPagination(); 
     var content = $('#logSearchField').val();
     var selected = $("#tabs").tabs( "option", "selected" ); 
     
@@ -1189,12 +1190,14 @@ var logTable = $('#logTableID').dataTable({
       contentType: "application/json",
       processData: false, 
       success: function(data) {
+        var temp = JSON.parse(data.responseText);
         $("#queryOutput").empty();
-        $("#queryOutput").append('<b><font color=green>' + JSON.stringify(data) + '</font></b>'); 
+        $("#queryOutput").append('<font color=green>' + JSON.stringify(temp.errorMessage) + '</font>'); 
       },
       error: function(data) {
+        var temp = JSON.parse(data.responseText);
         $("#queryOutput").empty();
-        $("#queryOutput").append('<b><font color=red>' + JSON.stringify(data) + '</font></b>'); 
+        $("#queryOutput").append('<font color=red>' + JSON.stringify(temp.errorMessage) + '</font>'); 
       }
     });
   });
@@ -1739,7 +1742,11 @@ $(function() {
 ///////////////////////////////////////////////////////////////////////////////
 /// Log tables pagination  
 ///////////////////////////////////////////////////////////////////////////////
-function createLogTable(loglevel) { 
+function createLogTable(loglevel) {
+ 
+  $("#logSearchField").val(""); 
+  $(":input").focus(); 
+  showLogPagination();
   currentPage = 1;  
   currentLoglevel = loglevel;  
   var url = "/_admin/log?level="+loglevel+"&size=10";
@@ -2249,3 +2256,20 @@ function is_int(value){
       return false;
   }
 }
+
+function showLogPagination () {
+  $('#logToolbarAll').show(); 
+  $('#logToolbarCrit').show(); 
+  $('#logToolbarWarn').show(); 
+  $('#logToolbarDebu').show(); 
+  $('#logToolbarInfo').show(); 
+}
+
+function hideLogPagination() {
+  $('#logToolbarAll').hide(); 
+  $('#logToolbarCrit').hide(); 
+  $('#logToolbarWarn').hide(); 
+  $('#logToolbarDebu').hide(); 
+  $('#logToolbarInfo').hide(); 
+}
+