diff --git a/public/css/main.less b/public/css/main.less
index a69c2397829..23fcc5c6318 100644
--- a/public/css/main.less
+++ b/public/css/main.less
@@ -30,8 +30,8 @@ html {
 }
 
 body {
-  padding-top: 80px;
-  margin-bottom: 60px;
+  padding-top: 50px;
+//  margin-bottom: 60px;
 }
 
 h1, h2 {
@@ -253,6 +253,10 @@ ul {
 .navbar {
   white-space: nowrap;
   border: none;
+  @media (min-width: 767px) {
+    padding-left: 30px;
+    padding-right: 30px;
+  }
 }
 
 .panel-body {
@@ -571,7 +575,7 @@ thead {
  */
 
 form.code span {
-  font-size: 14px;
+  font-size: 18px;
   font-family: "Ubuntu Mono";
   padding-bottom: 0px;
   margin-bottom: 0px;
@@ -597,6 +601,10 @@ form.code span {
   padding-bottom: 0px;
 }
 
+.panel-bonfire {
+  height: 100%
+}
+
 div.CodeMirror-scroll {
   padding-bottom: 100px;
 }
diff --git a/public/js/lib/bonfire/bonfireFramework.js b/public/js/lib/bonfire/bonfireFramework.js
index 02f9230f13a..45ac46ca0e4 100644
--- a/public/js/lib/bonfire/bonfireFramework.js
+++ b/public/js/lib/bonfire/bonfireFramework.js
@@ -47,8 +47,8 @@ var codeOutput = CodeMirror.fromTextArea(document.getElementById("codeOutput"),
     lineWrapping: true
 });
 codeOutput.setValue('/**\n' +
-' * Your output will go here. Console.log() -type statements\n' +
-' * will appear in your browser\'s javascript console.\n' +
+' * Your output will go here.\n' + ' * Console.log() -type statements\n' +
+' * will appear in your browser\'s\n' + ' * DevTools JavaScript console.\n' +
 ' */');
 codeOutput.setSize("100%", "100%");
 var info = editor.getScrollInfo();
@@ -178,11 +178,11 @@ var createTestDisplay = function() {
         var testDoc = document.createElement("div");
         if (test.err != null) {
             $(testDoc)
-                .html("<div class='row'><div class='col-xs-1 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-11 test-output wrappable'>" + test.text + "</div><div class='col-xs-11 test-output wrappable'>" + test.err + "</div></div>")
+                .html("<div class='row'><div class='col-xs-1 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-11 test-output wrappable'>" + test.text + "</div><div class='col-xs-11 test-output wrappable'>" + test.err + "</div></div><div class='ten-pixel-break'/>")
                 .prependTo($('#testSuite'))
         } else {
             $(testDoc)
-                .html("<div class='row'><div class='col-xs-1 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-11 test-output test-vertical-center wrappable'>" + test.text + "</div></div>")
+                .html("<div class='row'><div class='col-xs-1 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-11 test-output test-vertical-center wrappable'>" + test.text + "</div></div><div class='ten-pixel-break'/>")
                 .appendTo($('#testSuite'));
         }
     };
diff --git a/views/bonfire/show.jade b/views/bonfire/show.jade
index 0224965ce07..23a3404d68b 100644
--- a/views/bonfire/show.jade
+++ b/views/bonfire/show.jade
@@ -17,52 +17,87 @@ block content
     script(src='/js/lib/bonfire/bonfireInit.js')
 
 
-    .row
+    .panel.panel-primary.panel-bonfire
+        .panel.panel-body
+            .row
+                .col-xs-12.col-sm-12.col-md-3
+                    #testCreatePanel
+                            h2.text-center #{name}
+                                Difficulty: &nbsp;
+                                if (difficulty == "0")
+                                    i.ion-ios-flame-outline
+                                    i.ion-ios-flame-outline
+                                    i.ion-ios-flame-outline
+                                    i.ion-ios-flame-outline
+                                    i.ion-ios-flame-outline
+                                if (difficulty == "1")
+                                    i.ion-ios-flame
+                                    i.ion-ios-flame-outline
+                                    i.ion-ios-flame-outline
+                                    i.ion-ios-flame-outline
+                                    i.ion-ios-flame-outline
+                                if (difficulty == "2")
+                                    i.ion-ios-flame
+                                    i.ion-ios-flame
+                                    i.ion-ios-flame-outline
+                                    i.ion-ios-flame-outline
+                                    i.ion-ios-flame-outline
+                                if (difficulty == "3")
+                                    i.ion-ios-flame
+                                    i.ion-ios-flame
+                                    i.ion-ios-flame
+                                    i.ion-ios-flame-outline
+                                    i.ion-ios-flame-outline
+                                if (difficulty == "4")
+                                    i.ion-ios-flame
+                                    i.ion-ios-flame
+                                    i.ion-ios-flame
+                                    i.ion-ios-flame
+                                    i.ion-ios-flame-outline
+                                if (difficulty == "5")
+                                    i.ion-ios-flame
+                                    i.ion-ios-flame
+                                    i.ion-ios-flame
+                                    i.ion-ios-flame
+                                    i.ion-ios-flame
+                            .well
+                                .row.text-center
+                                    row.text-center
+                                        .col-xs-12
+                                            .bonfire-instructions
+                                                = brief
+                                        #brief-instructions.col-xs-12
+                                            button#more-info.btn.btn-info
+                                                span.ion-help-circled
+                                                | More information
+                                    #long-instructions.row.text-center.hide
+                                        .col-xs-12
+                                            .bonfire-instructions
+                                                for sentence in details
+                                                    p!= sentence
+                                            button#less-info.btn.btn-info
+                                                span.ion-help-circled
+                                                | Less information
+                            #submitButton.btn.btn-primary.btn-big.btn-block Run code (ctrl + enter)
+                            br
+                            form.code
+                                .form-group.codeMirrorView
+                                    textarea#codeOutput
+                            br
+                            #testSuite
+                            br
+                            script(type="text/javascript").
+                                var tests = !{JSON.stringify(tests)};
+                                var challengeSeed = !{JSON.stringify(challengeSeed)};
+                                var challengeEntryPoint = !{JSON.stringify(challengeEntryPoint)};
+                                var passedBonfireHash = !{JSON.stringify(bonfireHash)};
+                .col-xs-12.col-sm-12.col-md-9
+                    #mainEditorPanel
+                        form.code
+                            .form-group.codeMirrorView
+                                textarea#codeEditor(autofocus=true)
+                        script(src='/js/lib/bonfire/bonfireFramework.js')
 
-        #testCreatePanel.col-xs-12.col-sm-12.col-md-4
-            .panel.panel-primary.panel-bonfire
-                .panel-heading.text-center Output
-                .panel.panel-body
-                    .well
-                        .row.text-center
-                            row.text-center
-                                .col-xs-12
-                                    .bonfire-instructions
-                                        = brief
-                                #brief-instructions.col-xs-12
-                                    button#more-info.btn.btn-info
-                                        span.ion-help-circled
-                                        | More information
-                            #long-instructions.row.text-center.hide
-                                .col-xs-12
-                                    .bonfire-instructions
-                                        for sentence in details
-                                            p!= sentence
-                                    button#less-info.btn.btn-info
-                                        span.ion-help-circled
-                                        | Less information
-                    #submitButton.btn.btn-primary.btn-big.btn-block Run code (ctrl + enter)
-                    br
-                    form.code
-                        .form-group.codeMirrorView
-                            textarea#codeOutput
-                    br
-                    #testSuite
-                    br
-                    script(type="text/javascript").
-                        var tests = !{JSON.stringify(tests)};
-                        var challengeSeed = !{JSON.stringify(challengeSeed)};
-                        var challengeEntryPoint = !{JSON.stringify(challengeEntryPoint)};
-                        var passedBonfireHash = !{JSON.stringify(bonfireHash)};
-
-        #mainEditorPanel.col-xs-12.col-sm-12.col-md-8
-            .panel.panel-primary.panel-bonfire
-                .panel-heading.text-center #{name} (Level #{difficulty} bonfire)
-                .panel.panel-body
-                    form.code
-                        .form-group.codeMirrorView
-                            textarea#codeEditor(autofocus=true)
-                    script(src='/js/lib/bonfire/bonfireFramework.js')
 
 
     #complete-bonfire-dialog.modal(tabindex='-1')
diff --git a/views/partials/navbar.jade b/views/partials/navbar.jade
index e6ca1aba4f3..0cbfe2dc687 100644
--- a/views/partials/navbar.jade
+++ b/views/partials/navbar.jade
@@ -1,5 +1,4 @@
 nav.navbar.navbar-default.navbar-fixed-top.nav-height
-  .container
     .navbar-header
       button.navbar-toggle(type='button', data-toggle='collapse', data-target='.navbar-collapse')
         span.sr-only Toggle navigation