diff --git a/frontend/css/documentsView.css b/frontend/css/documentsView.css
index 13ea7a5b88..69dfccfd11 100644
--- a/frontend/css/documentsView.css
+++ b/frontend/css/documentsView.css
@@ -1,3 +1,11 @@
+#documentsTableID .sorting_asc, #documentsTableID .sorting, #documentsTableID .sorting_desc {
+  background: none;
+}
+
+table.dataTable thead th {
+  cursor: default !important;
+}
+
 .docleftico {
   width: 30px !important;
 }
diff --git a/frontend/css/queryView.css b/frontend/css/queryView.css
index b964269049..3c1d7bbbc8 100644
--- a/frontend/css/queryView.css
+++ b/frontend/css/queryView.css
@@ -48,24 +48,11 @@
   padding-top: 5px;
 }
 
-#queryInput {
-  border-radius: 0 0 0 0 !important;
-  margin-top: 5px;
-  margin-bottom: 8px;
-  border: 1px solid #DDDDDD;
-  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
-  height: 100px !important;
-  font-family: Consolas,"Liberation Mono",Courier,monospace !important;
-  font-size: 12px !important;
-  width: 886px;
-  resize: vertical;
-}
-
 #queryOutput {
   width: 890px;
   background-color: white;
   height: 350px;
-  overflow-y: auto;
+  overflow-y: hidden;
   resize: vertical !important;
   border: 1px solid #c0c0c0;
 }
diff --git a/frontend/js/views/documentsView.js b/frontend/js/views/documentsView.js
index 2fe98a406c..e3742d8d30 100644
--- a/frontend/js/views/documentsView.js
+++ b/frontend/js/views/documentsView.js
@@ -82,9 +82,11 @@ var documentsView = Backbone.View.extend({
     this.collectionID = colid;
     this.currentPage = pageid;
     var documentsTable = $('#documentsTableID').dataTable({
+      "aaSorting": [[ 1, "asc" ]],
       "bFilter": false,
       "bPaginate":false,
       "bSortable": false,
+      "bSort": false,
       "bLengthChange": false,
       "bAutoWidth": false,
       "iDisplayLength": -1,
@@ -92,8 +94,6 @@ var documentsView = Backbone.View.extend({
       "aoColumns": [
         { "sClass":"read_only leftCell docleftico", "bSortable": false, "sWidth":"30px"},
         { "sClass":"read_only arangoTooltip","bSortable": false},
-      //  { "sClass":"read_only","bSortable": false, "sWidth": "100px"},
-      //  { "sClass":"read_only","bSortable": false, "sWidth": "100px"},
         { "bSortable": false, "sClass": "cuttedContent rightCell", "sWidth": "500px"}
       ],
       "oLanguage": { "sEmptyTable": "No documents"}
diff --git a/frontend/js/views/queryView.js b/frontend/js/views/queryView.js
index 33925a3460..96b20791f5 100644
--- a/frontend/js/views/queryView.js
+++ b/frontend/js/views/queryView.js
@@ -26,6 +26,25 @@ var queryView = Backbone.View.extend({
     editor.resize();
     editor2.setValue('');
     editor2.resize();
+
+    $('#queryOutput').resizable({
+      handles: "n, s",
+      ghost: true,
+      stop: function () {
+        var editor2 = ace.edit("queryOutput");
+        editor2.resize();
+      }
+    });
+    $('#aqlEditor').resizable({
+      handles: "n, s",
+      ghost: true,
+      helper: "resizable-helper",
+      stop: function () {
+        var editor = ace.edit("aqlEditor");
+        editor.resize();
+      }
+    });
+
     $('#aqlEditor .ace_text-input').focus();
     return this;
   },