diff --git a/public/css/main.less b/public/css/main.less
index 7c51142148..b8b623428c 100644
--- a/public/css/main.less
+++ b/public/css/main.less
@@ -525,9 +525,23 @@ thead {
   }
 }
 
+form.code div {
+  border-radius: 5px;
+}
 form.code span {
   font-size: 16px;
   font-family: "Courier New", "Lucida Console", monospace;
+  padding-bottom: 0px;
+  margin-bottom: 0px;
+
+}
+
+#mainEditorPanel .panel-body {
+  padding-bottom: 0px;
+}
+
+.panel-bonfire {
+  min-height: 590px;
 }
 
 //uncomment this to see the dimensions of all elements outlined in red
diff --git a/public/js/lib/codemirror/lib/codemirror.css b/public/js/lib/codemirror/lib/codemirror.css
index c56510e99a..d4832bd020 100644
--- a/public/js/lib/codemirror/lib/codemirror.css
+++ b/public/js/lib/codemirror/lib/codemirror.css
@@ -151,7 +151,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   /* 30px is the magic margin used to hide the element's real scrollbars */
   /* See overflow: hidden in .CodeMirror */
   margin-bottom: -30px; margin-right: -30px;
-  padding-bottom: 30px;
+  padding-bottom: 0px;
   height: 100%;
   outline: none; /* Prevent dragging from highlighting the element */
   position: relative;
diff --git a/views/bonfire/bonfire.jade b/views/bonfire/bonfire.jade
index 1a2d02f54d..84f9d3c425 100644
--- a/views/bonfire/bonfire.jade
+++ b/views/bonfire/bonfire.jade
@@ -14,43 +14,31 @@ block content
     script(src='js/lib/jailed/jailed.js')
     script(src='/js/lib/bonfire/bonfire.js')
     .row
-        #mainEditorPanel.col-sm-12.col-md-12.col-xs-12
-            .panel.panel-primary
+        #mainEditorPanel.col-sm-12.col-md-7.col-xs-12
+            .panel.panel-primary.panel-bonfire
                 .panel-heading.text-center Bonfire Playground
                 .panel.panel-body
                     form.code
                         .form-group.codeMirrorView
                             textarea#codeEditor(autofocus=true)
+
+
+        #testCreatePanel.col-sm-12.col-md-5.col-xs-12
+            .panel.panel-primary.panel-bonfire
+                .panel-heading.text-center Output
+                .panel.panel-body
+                    ul#testSuite.list-group
+                        #submitButton.btn.btn-primary.btn-big.btn-block Run code (ctrl + enter)
+                    form#testCreateForm.form-horizontal
+                    br
                     form.code
                         .form-group.codeMirrorView
                             textarea#codeOutput
-                    #submitButton.btn.btn-primary.btn-big.btn-block Run my code
-                    .hidden-xs
-                        br
-                        #sideBySide.btn.btn-primary.btn-block.btn-big Tests side by side
-        #testCreatePanel.col-sm-6.col-md-6.col-xs-12
-            .panel.panel-primary
-                .panel-heading Test Code
-                .panel.panel-body
-                    form#testCreateForm.form-horizontal
-                        .form-group
-                            label(for='function-select').col-sm-6 Select function
-                            select#testFunctionName.col-sm-6.text-info
-                                option
-                        #testInputs.form-group
-                        #testOutputs.form-group
-                        br
-                        #addTest.btn.text-info Create test
-                    #hideTestCreate.btn.text-info Hide test creation dialogue
-        #testSuitePanel.col-sm-6.col-md-6.col-xs-12
-            .panel.panel-primary
-                .panel-heading Test Suite
-                .panel.panel-body
-                    ul#testSuite.list-group
+
+                    #testInputs.form-group
+                    #testOutputs.form-group
                     br
 
-                    #runTests.btn.btn-primary.btn-big.btn-block Run my test suite
-                    textarea#testOutput
                     script.
                         var widgets = [];
                         var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("codeEditor"), {
@@ -221,7 +209,7 @@ block content
                             var closeSpan = document.createElement('span');
                             $(closeSpan)
                                     .addClass("glyphicon glyphicon-remove-sign")
-                                    .css("float", "right")
+                                    //.css("float", "right")
                                     .click(function () {
                                         //var input = prompt("This will remove the test permanently.\n If you want to do this, type delete");
                                         if (/delete/.test(input.toLowerCase())) {