diff --git a/html/admin/css/footerView.css b/html/admin/css/footerView.css
index 48544545c5..131a119937 100644
--- a/html/admin/css/footerView.css
+++ b/html/admin/css/footerView.css
@@ -4,7 +4,7 @@
   text-align: center;
   left: 0;
   right: 0;
-  margin-top:300px;
+  margin-top:500px;
 }
 
 .footerExtra {
diff --git a/html/admin/css/layout.css b/html/admin/css/layout.css
index 9d6afc9f0b..318e4b38e8 100644
--- a/html/admin/css/layout.css
+++ b/html/admin/css/layout.css
@@ -32,6 +32,10 @@ input {
   box-shadow: 0;
 }
 
+#transparentHeader h4 {
+  margin-top: 7px;
+}
+
 .navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle {
 	background: #788f3d;
 }
diff --git a/html/admin/css/queryView.css b/html/admin/css/queryView.css
index 4ddca55a71..a6c628b1f8 100644
--- a/html/admin/css/queryView.css
+++ b/html/admin/css/queryView.css
@@ -1,3 +1,10 @@
+.ui-resizable-s {
+  bottom: 0;
+  height: 10px;
+  background-color: #686766 !important;
+  cursor: ns-resize;
+}
+
 #queryOutput .ace_cursor-layer {
   display:none;
 }
@@ -31,6 +38,7 @@
 #aqlEditor {
   width: 898px;
   height: 200px;
+  min-height: 100px;
   border: 1px solid #C0C0C0;
   margin-bottom: 20px;
 }
@@ -59,9 +67,9 @@
 #queryOutput {
   width: 898px;
   background-color: white;
-  height: 350px;
+  height: 200px;
+  min-height: 100px;
   overflow-y: hidden;
-  resize: vertical !important;
   border: 1px solid #c0c0c0;
 }
 
diff --git a/html/admin/css/shellView.css b/html/admin/css/shellView.css
index b2e70df091..24345f0394 100644
--- a/html/admin/css/shellView.css
+++ b/html/admin/css/shellView.css
@@ -12,7 +12,7 @@
   margin-top: 30px;
   margin-left: 20px;
   margin-bottom: -20px;
-  height: 500px;
+  height: 400px;
   background-color: black;
 }
 
diff --git a/html/admin/js/views/queryView.js b/html/admin/js/views/queryView.js
index ad2591a0ba..05ce8cbc4b 100644
--- a/html/admin/js/views/queryView.js
+++ b/html/admin/js/views/queryView.js
@@ -27,9 +27,7 @@ var queryView = Backbone.View.extend({
     editor.getSession().setMode("ace/mode/aql");
     editor2.getSession().setMode("ace/mode/json");
     editor.setTheme("ace/theme/merbivore_soft");
-    editor.resize();
     editor2.setValue('');
-    editor2.resize();
 
     $('#queryOutput').resizable({
       handles: "s",
@@ -42,7 +40,7 @@ var queryView = Backbone.View.extend({
     $('#aqlEditor').resizable({
       handles: "s",
       ghost: true,
-      helper: "resizable-helper",
+      //helper: "resizable-helper",
       stop: function () {
         var editor = ace.edit("aqlEditor");
         editor.resize();
@@ -58,6 +56,14 @@ var queryView = Backbone.View.extend({
       editor.setValue(queryContent);
       editor2.setValue(queryOutput);
     }
+
+    var windowHeight = $(window).height() - 250;
+    $('#queryOutput').height(windowHeight/2);
+    $('#aqlEditor').height(windowHeight/2);
+
+    editor.resize();
+    editor2.resize();
+
     return this;
   },
   submitQuery: function() {
@@ -84,7 +90,7 @@ var queryView = Backbone.View.extend({
         try {
           var temp = JSON.parse(data.responseText);
           editor2.setValue('[' + temp.errorNum + '] ' + temp.errorMessage);
-        
+
           if(typeof(Storage) !== "undefined") {
             localStorage.setItem("queryContent", editor.getValue());
             localStorage.setItem("queryOutput", editor2.getValue());
@@ -95,6 +101,7 @@ var queryView = Backbone.View.extend({
         }
       }
     });
+    editor2.resize();
 
   },
   FormatJSON: function(oData, sIndent) {
diff --git a/html/admin/js/views/shellView.js b/html/admin/js/views/shellView.js
index b59f478d44..e058cbb79e 100644
--- a/html/admin/js/views/shellView.js
+++ b/html/admin/js/views/shellView.js
@@ -9,14 +9,21 @@ var shellView = Backbone.View.extend({
 
   render: function() {
     $(this.el).html(this.template.text);
+
     this.replShell();
     this.editor();
+
+    var windowHeight = $(window).height() - 200;
+    $('#shell_workspace').height(windowHeight);
+
     $("#shell_workspace").splitter({
       dock: true
     });
+
     $("#shell_workspace").trigger("resize", [ 200 ]);
     $('.vsplitbar').append('<div id="editor-run"><img src="img/right_icon.png"></img></div>');
     $.gritter.removeAll();
+
     return this;
   },
   renderEditor: function () {