diff --git a/public/js/lib/coursewares/commonFrameWork.js b/public/js/lib/coursewares/commonFrameWork.js
index ad8eea6c72..1a40d2f1f4 100644
--- a/public/js/lib/coursewares/commonFrameWork.js
+++ b/public/js/lib/coursewares/commonFrameWork.js
@@ -182,46 +182,48 @@ function scopejQuery(s){
 }
 
 function safeHTMLRun(test){
-    var previewFrame = document.getElementById('preview');
-    var preview = previewFrame.contentDocument || previewFrame.contentWindow.document;
-    if(editor.getValue().match(/\<script\>/gi) !== null) {
-        var s = editor.getValue().split(/\<\s?script\s?\>/gi)[1].split(/\<\s?\/\s?script\s?\>/gi)[0];
-        s = "var document = \"\"; var $ = function(){return(new function(){this.add=function(){return(this);};this.addBack=function(){return(this);};this.addClass=function(){return(this);};this.after=function(){return(this);};this.ajaxComplete=function(){return(this);};this.ajaxError=function(){return(this);};this.ajaxSend=function(){return(this);};this.ajaxStart=function(){return(this);};this.ajaxStop=function(){return(this);};this.ajaxSuccess=function(){return(this);};this.andSelf=function(){return(this);};this.animate=function(){return(this);};this.append=function(){return(this);};this.appendTo=function(){return(this);};this.attr=function(){return(this);};this.before=function(){return(this);};this.bind=function(){return(this);};this.blur=function(){return(this);};this.callbacksadd=function(){return(this);};this.callbacksdisable=function(){return(this);};this.callbacksdisabled=function(){return(this);};this.callbacksempty=function(){return(this);};this.callbacksfire=function(){return(this);};this.callbacksfired=function(){return(this);};this.callbacksfireWith=function(){return(this);};this.callbackshas=function(){return(this);};this.callbackslock=function(){return(this);};this.callbackslocked=function(){return(this);};this.callbacksremove=function(){return(this);};this.change=function(){return(this);};this.children=function(){return(this);};this.clearQueue=function(){return(this);};this.click=function(){return(this);};this.clone=function(){return(this);};this.closest=function(){return(this);};this.contents=function(){return(this);};this.context=function(){return(this);};this.css=function(){return(this);};this.data=function(){return(this);};this.dblclick=function(){return(this);};this.delay=function(){return(this);};this.delegate=function(){return(this);};this.dequeue=function(){return(this);};this.detach=function(){return(this);};this.die=function(){return(this);};this.each=function(){return(this);};this.empty=function(){return(this);};this.end=function(){return(this);};this.eq=function(){return(this);};this.error=function(){return(this);};this.fadeIn=function(){return(this);};this.fadeOut=function(){return(this);};this.fadeTo=function(){return(this);};this.fadeToggle=function(){return(this);};this.filter=function(){return(this);};this.find=function(){return(this);};this.finish=function(){return(this);};this.first=function(){return(this);};this.focus=function(){return(this);};this.focusin=function(){return(this);};this.focusout=function(){return(this);};this.get=function(){return(this);};this.has=function(){return(this);};this.hasClass=function(){return(this);};this.height=function(){return(this);};this.hide=function(){return(this);};this.hover=function(){return(this);};this.html=function(){return(this);};this.index=function(){return(this);};this.innerHeight=function(){return(this);};this.innerWidth=function(){return(this);};this.insertAfter=function(){return(this);};this.insertBefore=function(){return(this);};this.is=function(){return(this);};this.jQuery=function(){return(this);};this.jquery=function(){return(this);};this.keydown=function(){return(this);};this.keypress=function(){return(this);};this.keyup=function(){return(this);};this.last=function(){return(this);};this.length=function(){return(this);};this.live=function(){return(this);};this.load=function(){return(this);};this.load=function(){return(this);};this.map=function(){return(this);};this.mousedown=function(){return(this);};this.mouseenter=function(){return(this);};this.mouseleave=function(){return(this);};this.mousemove=function(){return(this);};this.mouseout=function(){return(this);};this.mouseover=function(){return(this);};this.mouseup=function(){return(this);};this.next=function(){return(this);};this.nextAll=function(){return(this);};this.nextUntil=function(){return(this);};this.not=function(){return(this);};this.off=function(){return(this);};this.offset=function(){return(this);};this.offsetParent=function(){return(this);};this.on=function(){return(this);};this.one=function(){return(this);};this.outerHeight=function(){return(this);};this.outerWidth=function(){return(this);};this.parent=function(){return(this);};this.parents=function(){return(this);};this.parentsUntil=function(){return(this);};this.position=function(){return(this);};this.prepend=function(){return(this);};this.prependTo=function(){return(this);};this.prev=function(){return(this);};this.prevAll=function(){return(this);};this.prevUntil=function(){return(this);};this.promise=function(){return(this);};this.prop=function(){return(this);};this.pushStack=function(){return(this);};this.queue=function(){return(this);};this.ready=function(){return(this);};this.remove=function(){return(this);};this.removeAttr=function(){return(this);};this.removeClass=function(){return(this);};this.removeData=function(){return(this);};this.removeProp=function(){return(this);};this.replaceAll=function(){return(this);};this.replaceWith=function(){return(this);};this.resize=function(){return(this);};this.scroll=function(){return(this);};this.scrollLeft=function(){return(this);};this.scrollTop=function(){return(this);};this.select=function(){return(this);};this.selector=function(){return(this);};this.serialize=function(){return(this);};this.serializeArray=function(){return(this);};this.show=function(){return(this);};this.siblings=function(){return(this);};this.size=function(){return(this);};this.slice=function(){return(this);};this.slideDown=function(){return(this);};this.slideToggle=function(){return(this);};this.slideUp=function(){return(this);};this.stop=function(){return(this);};this.submit=function(){return(this);};this.text=function(){return(this);};this.toArray=function(){return(this);};this.toggle=function(){return(this);};this.toggle=function(){return(this);};this.toggleClass=function(){return(this);};this.trigger=function(){return(this);};this.triggerHandler=function(){return(this);};this.unbind=function(){return(this);};this.undelegate=function(){return(this);};this.unload=function(){return(this);};this.unwrap=function(){return(this);};this.val=function(){return(this);};this.width=function(){return(this);};this.wrap=function(){return(this);};this.wrapAll=function(){return(this);};this.wrapInner=function(){return(this);}});};$.ajax=function(){return($);};$.ajaxPrefilter=function(){return($);};$.ajaxSetup=function(){return($);};$.ajaxTransport=function(){return($);};$.boxModel=function(){return($);};$.browser=function(){return($);};$.Callbacks=function(){return($);};$.contains=function(){return($);};$.cssHooks=function(){return($);};$.cssNumber=function(){return($);};$.data=function(){return($);};$.Deferred=function(){return($);};$.dequeue=function(){return($);};$.each=function(){return($);};$.error=function(){return($);};$.extend=function(){return($);};$.fnextend=function(){return($);};$.fxinterval=function(){return($);};$.fxoff=function(){return($);};$.get=function(){return($);};$.getJSON=function(){return($);};$.getScript=function(){return($);};$.globalEval=function(){return($);};$.grep=function(){return($);};$.hasData=function(){return($);};$.holdReady=function(){return($);};$.inArray=function(){return($);};$.isArray=function(){return($);};$.isEmptyObject=function(){return($);};$.isFunction=function(){return($);};$.isNumeric=function(){return($);};$.isPlainObject=function(){return($);};$.isWindow=function(){return($);};$.isXMLDoc=function(){return($);};$.makeArray=function(){return($);};$.map=function(){return($);};$.merge=function(){return($);};$.noConflict=function(){return($);};$.noop=function(){return($);};$.now=function(){return($);};$.param=function(){return($);};$.parseHTML=function(){return($);};$.parseJSON=function(){return($);};$.parseXML=function(){return($);};$.post=function(){return($);};$.proxy=function(){return($);};$.queue=function(){return($);};$.removeData=function(){return($);};$.sub=function(){return($);};$.support=function(){return($);};$.trim=function(){return($);};$.type=function(){return($);};$.unique=function(){return($);};$.when=function(){return($);};$.always=function(){return($);};$.done=function(){return($);};$.fail=function(){return($);};$.isRejected=function(){return($);};$.isResolved=function(){return($);};$.notify=function(){return($);};$.notifyWith=function(){return($);};$.pipe=function(){return($);};$.progress=function(){return($);};$.promise=function(){return($);};$.reject=function(){return($);};$.rejectWith=function(){return($);};$.resolve=function(){return($);};$.resolveWith=function(){return($);};$.state=function(){return($);};$.then=function(){return($);};$.currentTarget=function(){return($);};$.data=function(){return($);};$.delegateTarget=function(){return($);};$.isDefaultPrevented=function(){return($);};$.isImmediatePropagationStopped=function(){return($);};$.isPropagationStopped=function(){return($);};$.metaKey=function(){return($);};$.namespace=function(){return($);};$.pageX=function(){return($);};$.pageY=function(){return($);};$.preventDefault=function(){return($);};$.relatedTarget=function(){return($);};$.result=function(){return($);};$.stopImmediatePropagation=function(){return($);};$.stopPropagation=function(){return($);};$.target=function(){return($);};$.timeStamp=function(){return($);};$.type=function(){return($);};$.which=function(){return($);};"+s;
-        submit(
-            scopejQuery(s), function (cls, message) {
-                if (cls) {
-                    console.log(message.error);
-                    workerError(message.error);
-                } else {
-                    if(test){
-                        preview.open();
-                        preview.write(libraryIncludes + editor.getValue() + iFrameScript);
-                        codeStorage.updateStorage();
-                        preview.close();
-                    }
-                    else{
-                        preview.open();
-                        preview.write(libraryIncludes + editor.getValue());
-                        codeStorage.updateStorage();
-                        preview.close();
+    if(challengeType === "0"){
+        var previewFrame = document.getElementById('preview');
+        var preview = previewFrame.contentDocument || previewFrame.contentWindow.document;
+        if(editor.getValue().match(/\<script\>/gi) !== null) {
+            var s = editor.getValue().split(/\<\s?script\s?\>/gi)[1].split(/\<\s?\/\s?script\s?\>/gi)[0];
+            s = "var document = \"\"; var $ = function(){return(new function(){this.add=function(){return(this);};this.addBack=function(){return(this);};this.addClass=function(){return(this);};this.after=function(){return(this);};this.ajaxComplete=function(){return(this);};this.ajaxError=function(){return(this);};this.ajaxSend=function(){return(this);};this.ajaxStart=function(){return(this);};this.ajaxStop=function(){return(this);};this.ajaxSuccess=function(){return(this);};this.andSelf=function(){return(this);};this.animate=function(){return(this);};this.append=function(){return(this);};this.appendTo=function(){return(this);};this.attr=function(){return(this);};this.before=function(){return(this);};this.bind=function(){return(this);};this.blur=function(){return(this);};this.callbacksadd=function(){return(this);};this.callbacksdisable=function(){return(this);};this.callbacksdisabled=function(){return(this);};this.callbacksempty=function(){return(this);};this.callbacksfire=function(){return(this);};this.callbacksfired=function(){return(this);};this.callbacksfireWith=function(){return(this);};this.callbackshas=function(){return(this);};this.callbackslock=function(){return(this);};this.callbackslocked=function(){return(this);};this.callbacksremove=function(){return(this);};this.change=function(){return(this);};this.children=function(){return(this);};this.clearQueue=function(){return(this);};this.click=function(){return(this);};this.clone=function(){return(this);};this.closest=function(){return(this);};this.contents=function(){return(this);};this.context=function(){return(this);};this.css=function(){return(this);};this.data=function(){return(this);};this.dblclick=function(){return(this);};this.delay=function(){return(this);};this.delegate=function(){return(this);};this.dequeue=function(){return(this);};this.detach=function(){return(this);};this.die=function(){return(this);};this.each=function(){return(this);};this.empty=function(){return(this);};this.end=function(){return(this);};this.eq=function(){return(this);};this.error=function(){return(this);};this.fadeIn=function(){return(this);};this.fadeOut=function(){return(this);};this.fadeTo=function(){return(this);};this.fadeToggle=function(){return(this);};this.filter=function(){return(this);};this.find=function(){return(this);};this.finish=function(){return(this);};this.first=function(){return(this);};this.focus=function(){return(this);};this.focusin=function(){return(this);};this.focusout=function(){return(this);};this.get=function(){return(this);};this.has=function(){return(this);};this.hasClass=function(){return(this);};this.height=function(){return(this);};this.hide=function(){return(this);};this.hover=function(){return(this);};this.html=function(){return(this);};this.index=function(){return(this);};this.innerHeight=function(){return(this);};this.innerWidth=function(){return(this);};this.insertAfter=function(){return(this);};this.insertBefore=function(){return(this);};this.is=function(){return(this);};this.jQuery=function(){return(this);};this.jquery=function(){return(this);};this.keydown=function(){return(this);};this.keypress=function(){return(this);};this.keyup=function(){return(this);};this.last=function(){return(this);};this.length=function(){return(this);};this.live=function(){return(this);};this.load=function(){return(this);};this.load=function(){return(this);};this.map=function(){return(this);};this.mousedown=function(){return(this);};this.mouseenter=function(){return(this);};this.mouseleave=function(){return(this);};this.mousemove=function(){return(this);};this.mouseout=function(){return(this);};this.mouseover=function(){return(this);};this.mouseup=function(){return(this);};this.next=function(){return(this);};this.nextAll=function(){return(this);};this.nextUntil=function(){return(this);};this.not=function(){return(this);};this.off=function(){return(this);};this.offset=function(){return(this);};this.offsetParent=function(){return(this);};this.on=function(){return(this);};this.one=function(){return(this);};this.outerHeight=function(){return(this);};this.outerWidth=function(){return(this);};this.parent=function(){return(this);};this.parents=function(){return(this);};this.parentsUntil=function(){return(this);};this.position=function(){return(this);};this.prepend=function(){return(this);};this.prependTo=function(){return(this);};this.prev=function(){return(this);};this.prevAll=function(){return(this);};this.prevUntil=function(){return(this);};this.promise=function(){return(this);};this.prop=function(){return(this);};this.pushStack=function(){return(this);};this.queue=function(){return(this);};this.ready=function(){return(this);};this.remove=function(){return(this);};this.removeAttr=function(){return(this);};this.removeClass=function(){return(this);};this.removeData=function(){return(this);};this.removeProp=function(){return(this);};this.replaceAll=function(){return(this);};this.replaceWith=function(){return(this);};this.resize=function(){return(this);};this.scroll=function(){return(this);};this.scrollLeft=function(){return(this);};this.scrollTop=function(){return(this);};this.select=function(){return(this);};this.selector=function(){return(this);};this.serialize=function(){return(this);};this.serializeArray=function(){return(this);};this.show=function(){return(this);};this.siblings=function(){return(this);};this.size=function(){return(this);};this.slice=function(){return(this);};this.slideDown=function(){return(this);};this.slideToggle=function(){return(this);};this.slideUp=function(){return(this);};this.stop=function(){return(this);};this.submit=function(){return(this);};this.text=function(){return(this);};this.toArray=function(){return(this);};this.toggle=function(){return(this);};this.toggle=function(){return(this);};this.toggleClass=function(){return(this);};this.trigger=function(){return(this);};this.triggerHandler=function(){return(this);};this.unbind=function(){return(this);};this.undelegate=function(){return(this);};this.unload=function(){return(this);};this.unwrap=function(){return(this);};this.val=function(){return(this);};this.width=function(){return(this);};this.wrap=function(){return(this);};this.wrapAll=function(){return(this);};this.wrapInner=function(){return(this);}});};$.ajax=function(){return($);};$.ajaxPrefilter=function(){return($);};$.ajaxSetup=function(){return($);};$.ajaxTransport=function(){return($);};$.boxModel=function(){return($);};$.browser=function(){return($);};$.Callbacks=function(){return($);};$.contains=function(){return($);};$.cssHooks=function(){return($);};$.cssNumber=function(){return($);};$.data=function(){return($);};$.Deferred=function(){return($);};$.dequeue=function(){return($);};$.each=function(){return($);};$.error=function(){return($);};$.extend=function(){return($);};$.fnextend=function(){return($);};$.fxinterval=function(){return($);};$.fxoff=function(){return($);};$.get=function(){return($);};$.getJSON=function(){return($);};$.getScript=function(){return($);};$.globalEval=function(){return($);};$.grep=function(){return($);};$.hasData=function(){return($);};$.holdReady=function(){return($);};$.inArray=function(){return($);};$.isArray=function(){return($);};$.isEmptyObject=function(){return($);};$.isFunction=function(){return($);};$.isNumeric=function(){return($);};$.isPlainObject=function(){return($);};$.isWindow=function(){return($);};$.isXMLDoc=function(){return($);};$.makeArray=function(){return($);};$.map=function(){return($);};$.merge=function(){return($);};$.noConflict=function(){return($);};$.noop=function(){return($);};$.now=function(){return($);};$.param=function(){return($);};$.parseHTML=function(){return($);};$.parseJSON=function(){return($);};$.parseXML=function(){return($);};$.post=function(){return($);};$.proxy=function(){return($);};$.queue=function(){return($);};$.removeData=function(){return($);};$.sub=function(){return($);};$.support=function(){return($);};$.trim=function(){return($);};$.type=function(){return($);};$.unique=function(){return($);};$.when=function(){return($);};$.always=function(){return($);};$.done=function(){return($);};$.fail=function(){return($);};$.isRejected=function(){return($);};$.isResolved=function(){return($);};$.notify=function(){return($);};$.notifyWith=function(){return($);};$.pipe=function(){return($);};$.progress=function(){return($);};$.promise=function(){return($);};$.reject=function(){return($);};$.rejectWith=function(){return($);};$.resolve=function(){return($);};$.resolveWith=function(){return($);};$.state=function(){return($);};$.then=function(){return($);};$.currentTarget=function(){return($);};$.data=function(){return($);};$.delegateTarget=function(){return($);};$.isDefaultPrevented=function(){return($);};$.isImmediatePropagationStopped=function(){return($);};$.isPropagationStopped=function(){return($);};$.metaKey=function(){return($);};$.namespace=function(){return($);};$.pageX=function(){return($);};$.pageY=function(){return($);};$.preventDefault=function(){return($);};$.relatedTarget=function(){return($);};$.result=function(){return($);};$.stopImmediatePropagation=function(){return($);};$.stopPropagation=function(){return($);};$.target=function(){return($);};$.timeStamp=function(){return($);};$.type=function(){return($);};$.which=function(){return($);};"+s;
+            submit(
+                scopejQuery(s), function (cls, message) {
+                    if (cls) {
+                        console.log(message.error);
+                        workerError(message.error);
+                    } else {
+                        if(test){
+                            preview.open();
+                            preview.write(libraryIncludes + editor.getValue() + iFrameScript);
+                            codeStorage.updateStorage();
+                            preview.close();
+                        }
+                        else{
+                            preview.open();
+                            preview.write(libraryIncludes + editor.getValue());
+                            codeStorage.updateStorage();
+                            preview.close();
+                        }
                     }
                 }
-            }
-        );
+            );
 
-    }
-    else {
-        if(test){
-            preview.open();
-            preview.write(libraryIncludes + editor.getValue() +iFrameScript);
-            codeStorage.updateStorage();
-            preview.close();
         }
-        else{
-            preview.open();
-            preview.write(libraryIncludes + editor.getValue());
-            codeStorage.updateStorage();
-            preview.close();
+        else {
+            if(test){
+                preview.open();
+                preview.write(libraryIncludes + editor.getValue() +iFrameScript);
+                codeStorage.updateStorage();
+                preview.close();
+            }
+            else{
+                preview.open();
+                preview.write(libraryIncludes + editor.getValue());
+                codeStorage.updateStorage();
+                preview.close();
+            }
         }
     }
 }
@@ -516,6 +518,25 @@ function bonfireExecute() {
                 codeOutput.setValue("Unsafe or Unfinished function declaration");
             }
         }
+        else{
+            submit(userJavaScript, function (cls, message) {
+                if (failedCommentTest) {
+                    myCodeMirror.setValue(myCodeMirror.getValue() + "*/");
+                    console.log('Caught Unfinished Comment');
+                    codeOutput.setValue("Unfinished mulit-line comment");
+                    failedCommentTest = false;
+                }
+                else if (cls) {
+                    codeOutput.setValue(message.error);
+                    runTests('Error', null);
+                } else {
+                    codeOutput.setValue(message.output);
+                    codeOutput.setValue(codeOutput.getValue().replace(/\\\"/gi, ''));
+                    message.input = removeLogs(message.input);
+                    runTests(null, message);
+                }
+            });
+        }
     }
     else {
         editorValueForIFrame = editor.getValue();
diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade
index 58a00b5f54..2b99885971 100644
--- a/server/views/coursewares/showBonfire.jade
+++ b/server/views/coursewares/showBonfire.jade
@@ -18,104 +18,104 @@ block content
 
     .row(ng-controller="pairedWithController")
         .col-xs-12.col-sm-12.col-md-4.col-lg-3
-            //.scroll-locker(id = "scroll-locker")
-            #testCreatePanel.well
-                h3.text-center.negative-10= name
-                .positive-15.positive-15-bottom
-                    h4.text-center.bonfire-flames Difficulty:&thinsp;
-                        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
-                .row
-                    .col-xs-12
-                        .bonfire-instructions
-                            for sentence in details
-                                p.wrappable.negative-10!= sentence
-                            .negative-bottom-margin-30
-                                #MDN-links
-                                    p.negative-10 Here are some helpful links:
-                                    for link, index in MDNlinks
-                                        .negative-10
-                                            ul: li: a(href=""+link, target="_blank") !{MDNkeys[index]}
-
-            if (user)
-                form.form-horizontal(novalidate='novalidate', name='completedWithForm')
-                    .form-group.text-center.negative-10
+            .scroll-locker(id = "scroll-locker")
+                #testCreatePanel.well
+                    h3.text-center.negative-10= name
+                    .positive-15.positive-15-bottom
+                        h4.text-center.bonfire-flames Difficulty:&thinsp;
+                            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
+                    .row
                         .col-xs-12
-                            // extra field to distract password tools like lastpass from injecting css into our username field
-                            input.form-control(ng-show="false")
-                            input.form-control#completed-with(name="existingUser", placeholder="Your pair's username if pairing", existing-username='', ng-model="existingUser")
-                        .col-xs-12(ng-cloak, ng-show="completedWithForm.$error.exists && !completedWithForm.existingUser.$pristine && existingUser.length > 0")
-                            alert(type='danger')
-                                span.ion-close-circled
-                                | Username not found
-            label.negative-10.btn.btn-primary.btn-block#submitButton
-                i.fa.fa-play
-                    | &nbsp; Run code (ctrl + enter)
-            .button-spacer
-            .btn-group.input-group.btn-group-justified
-                label.btn.btn-success#trigger-reset-modal
-                    i.fa.fa-refresh
-                        | &nbsp; Reset
-                label.btn.btn-success#trigger-help-modal
-                    i.fa.fa-medkit
-                        | &nbsp; Help
-                label.btn.btn-success#trigger-pair-modal
-                    i.fa.fa-user-plus
-                        | &nbsp; Pair
-                label.btn.btn-success#trigger-issue-modal
-                    i.fa.fa-bug
-                        | &nbsp; Bug
-            .button-spacer
+                            .bonfire-instructions
+                                for sentence in details
+                                    p.wrappable.negative-10!= sentence
+                                .negative-bottom-margin-30
+                                    #MDN-links
+                                        p.negative-10 Here are some helpful links:
+                                        for link, index in MDNlinks
+                                            .negative-10
+                                                ul: li: a(href=""+link, target="_blank") !{MDNkeys[index]}
 
-            form.code
-                .form-group.codeMirrorView
-                    textarea#codeOutput(style='display: none;')
-            br
-            #testSuite.negative-10
-            br
-            script(type="text/javascript").
-                var tests = !{JSON.stringify(tests)};
-                var challengeSeed = !{JSON.stringify(challengeSeed)};
-                var challenge_Id = !{JSON.stringify(challengeId)};
-                var challenge_Name = !{JSON.stringify(name)};
-                var started = Math.floor(Date.now());
-                var challengeType = !{JSON.stringify(challengeType)};
-                var _ = R;
-                var dashed = !{JSON.stringify(dashedName)};
+                if (user)
+                    form.form-horizontal(novalidate='novalidate', name='completedWithForm')
+                        .form-group.text-center.negative-10
+                            .col-xs-12
+                                // extra field to distract password tools like lastpass from injecting css into our username field
+                                input.form-control(ng-show="false")
+                                input.form-control#completed-with(name="existingUser", placeholder="Your pair's username if pairing", existing-username='', ng-model="existingUser")
+                            .col-xs-12(ng-cloak, ng-show="completedWithForm.$error.exists && !completedWithForm.existingUser.$pristine && existingUser.length > 0")
+                                alert(type='danger')
+                                    span.ion-close-circled
+                                    | Username not found
+                label.negative-10.btn.btn-primary.btn-block#submitButton
+                    i.fa.fa-play
+                        | &nbsp; Run code (ctrl + enter)
+                .button-spacer
+                .btn-group.input-group.btn-group-justified
+                    label.btn.btn-success#trigger-reset-modal
+                        i.fa.fa-refresh
+                            | &nbsp; Reset
+                    label.btn.btn-success#trigger-help-modal
+                        i.fa.fa-medkit
+                            | &nbsp; Help
+                    label.btn.btn-success#trigger-pair-modal
+                        i.fa.fa-user-plus
+                            | &nbsp; Pair
+                    label.btn.btn-success#trigger-issue-modal
+                        i.fa.fa-bug
+                            | &nbsp; Bug
+                .button-spacer
+
+                form.code
+                    .form-group.codeMirrorView
+                        textarea#codeOutput(style='display: none;')
+                br
+                #testSuite.negative-10
+                br
+                script(type="text/javascript").
+                    var tests = !{JSON.stringify(tests)};
+                    var challengeSeed = !{JSON.stringify(challengeSeed)};
+                    var challenge_Id = !{JSON.stringify(challengeId)};
+                    var challenge_Name = !{JSON.stringify(name)};
+                    var started = Math.floor(Date.now());
+                    var challengeType = !{JSON.stringify(challengeType)};
+                    var _ = R;
+                    var dashed = !{JSON.stringify(dashedName)};
 
         .col-xs-12.col-sm-12.col-md-8
             .editorScrollDiv(style = "overflow-y: auto; overflow-x: hidden;")
diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade
index 65659f2f9c..4f81c31e85 100644
--- a/server/views/coursewares/showHTML.jade
+++ b/server/views/coursewares/showHTML.jade
@@ -21,51 +21,51 @@ block content
     script(src='/js/lib/codemirror/addon/emmet/emmet.js')
     .row.courseware-height
         .col-xs-12.col-sm-12.col-md-3.col-lg-3
-            //.scroll-locker(id = "scroll-locker")
-            .innerMarginFix(style = "width: 99%;")
-                .well
-                    .row
-                        .col-xs-12
-                            h3.text-center.negative-10= name
-                            .bonfire-instructions
-                                for sentence in details
-                                    p.wrappable.negative-10!= sentence
-                                .negative-bottom-margin-30
-                label.negative-10.btn.btn-primary.btn-block#submitButton
-                    i.fa.fa-play
-                        | &nbsp; Run code (ctrl + enter)
-                br
-                if (user)
-                    .button-spacer
-                    .btn-group.input-group.btn-group-justified
-                        label.btn.btn-success#trigger-reset-modal
-                            i.fa.fa-refresh
-                                | &nbsp; Reset
-                        label.btn.btn-success#trigger-help-modal
-                            i.fa.fa-medkit
-                                | &nbsp; Help
-                        label.btn.btn-success#trigger-issue-modal
-                            i.fa.fa-bug
-                                | &nbsp; Bug
-                    script.
-                        var userLoggedIn = true;
-                else
-                    .button-spacer
-                    a.btn.signup-btn.btn-block.btn-block.negative-15(href='/login') Sign in so you can save your progress
+            .scroll-locker(id = "scroll-locker")
+                .innerMarginFix(style = "width: 99%;")
+                    .well
+                        .row
+                            .col-xs-12
+                                h3.text-center.negative-10= name
+                                .bonfire-instructions
+                                    for sentence in details
+                                        p.wrappable.negative-10!= sentence
+                                    .negative-bottom-margin-30
+                    label.negative-10.btn.btn-primary.btn-block#submitButton
+                        i.fa.fa-play
+                            | &nbsp; Run code (ctrl + enter)
+                    br
+                    if (user)
+                        .button-spacer
+                        .btn-group.input-group.btn-group-justified
+                            label.btn.btn-success#trigger-reset-modal
+                                i.fa.fa-refresh
+                                    | &nbsp; Reset
+                            label.btn.btn-success#trigger-help-modal
+                                i.fa.fa-medkit
+                                    | &nbsp; Help
+                            label.btn.btn-success#trigger-issue-modal
+                                i.fa.fa-bug
+                                    | &nbsp; Bug
                         script.
-                            var userLoggedIn = false;
-                .button-spacer
-                ul#testSuite.list-group
-                br
-                script(type="text/javascript").
-                    $('#next-courseware-button').attr('disabled', 'disabled');
-                    var tests = !{JSON.stringify(tests)};
-                    var challengeSeed = !{JSON.stringify(challengeSeed)};
-                    var challenge_Id = !{JSON.stringify(challengeId)};
-                    var challenge_Name = !{JSON.stringify(name)};
-                    var prodOrDev = !{JSON.stringify(environment)};
-                    var challengeType = !{JSON.stringify(challengeType)};
-                    var started = Math.floor(Date.now());
+                            var userLoggedIn = true;
+                    else
+                        .button-spacer
+                        a.btn.signup-btn.btn-block.btn-block.negative-15(href='/login') Sign in so you can save your progress
+                            script.
+                                var userLoggedIn = false;
+                    .button-spacer
+                    ul#testSuite.list-group
+                    br
+                    script(type="text/javascript").
+                        $('#next-courseware-button').attr('disabled', 'disabled');
+                        var tests = !{JSON.stringify(tests)};
+                        var challengeSeed = !{JSON.stringify(challengeSeed)};
+                        var challenge_Id = !{JSON.stringify(challengeId)};
+                        var challenge_Name = !{JSON.stringify(name)};
+                        var prodOrDev = !{JSON.stringify(environment)};
+                        var challengeType = !{JSON.stringify(challengeType)};
+                        var started = Math.floor(Date.now());
         .col-xs-12.col-sm-12.col-md-5.col-lg-6
             .editorScrollDiv(style = "overflow-y: auto; overflow-x: hidden;")
                     #mainEditorPanel
diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade
index 2d8acf85a3..fa3b9addb6 100644
--- a/server/views/coursewares/showJS.jade
+++ b/server/views/coursewares/showJS.jade
@@ -16,56 +16,56 @@ block content
     script(type='text/javascript', src='/js/lib/coursewares/sandbox.js')
     .row(ng-controller="pairedWithController")
         .col-xs-12.col-sm-12.col-md-4.col-lg-3
-            //.scroll-locker(id = "scroll-locker")
-            .innerMarginFix(style = "width: 99%;")
-                #testCreatePanel.well
-                    h3.text-center.negative-10= name
-                    .row
-                        .col-xs-12
-                            .bonfire-instructions
-                                for sentence in details
-                                    p.wrappable.negative-10!= sentence
-                                .negative-bottom-margin-30
-                                    #MDN-links
-                                        p.negative-10 Here are some helpful links:
-                                        for link, index in MDNlinks
-                                            .negative-10
-                                                ul: li: a(href="" + link, target="_blank") !{MDNkeys[index]}
-                if (user)
-                    form.form-horizontal(novalidate='novalidate', name='completedWithForm')
-                        .form-group.text-center.negative-10
+            .scroll-locker(id = "scroll-locker")
+                .innerMarginFix(style = "width: 99%;")
+                    #testCreatePanel.well
+                        h3.text-center.negative-10= name
+                        .row
                             .col-xs-12
-                                // extra field to distract password tools like lastpass from injecting css into our username field
-                label.negative-10.btn.btn-primary.btn-block#submitButton
-                    i.fa.fa-play
-                        | &nbsp; Run code (ctrl + enter)
-                .button-spacer
-                .btn-group.input-group.btn-group-justified
-                    label.btn.btn-success#trigger-reset-modal
-                        i.fa.fa-refresh
-                            | &nbsp; Reset
-                    label.btn.btn-success#trigger-help-modal
-                        i.fa.fa-medkit
-                            | &nbsp; Help
-                    label.btn.btn-success#trigger-issue-modal
-                        i.fa.fa-bug
-                            | &nbsp; Bug
-                .button-spacer
-                form.code
-                    .form-group.codeMirrorView
-                        textarea#codeOutput(style='display: none;')
-                br
-                #testSuite.negative-10
-                br
-                script(type="text/javascript").
-                    var tests = !{JSON.stringify(tests)};
-                    var challengeSeed = !{JSON.stringify(challengeSeed)};
-                    var challenge_Id = !{JSON.stringify(challengeId)};
-                    var challenge_Name = !{JSON.stringify(name)};
-                    var started = Math.floor(Date.now());
-                    var challengeType = !{JSON.stringify(challengeType)};
-                    var _ = R;
-                    var dashed = !{JSON.stringify(dashedName)};
+                                .bonfire-instructions
+                                    for sentence in details
+                                        p.wrappable.negative-10!= sentence
+                                    .negative-bottom-margin-30
+                                        #MDN-links
+                                            p.negative-10 Here are some helpful links:
+                                            for link, index in MDNlinks
+                                                .negative-10
+                                                    ul: li: a(href="" + link, target="_blank") !{MDNkeys[index]}
+                    if (user)
+                        form.form-horizontal(novalidate='novalidate', name='completedWithForm')
+                            .form-group.text-center.negative-10
+                                .col-xs-12
+                                    // extra field to distract password tools like lastpass from injecting css into our username field
+                    label.negative-10.btn.btn-primary.btn-block#submitButton
+                        i.fa.fa-play
+                            | &nbsp; Run code (ctrl + enter)
+                    .button-spacer
+                    .btn-group.input-group.btn-group-justified
+                        label.btn.btn-success#trigger-reset-modal
+                            i.fa.fa-refresh
+                                | &nbsp; Reset
+                        label.btn.btn-success#trigger-help-modal
+                            i.fa.fa-medkit
+                                | &nbsp; Help
+                        label.btn.btn-success#trigger-issue-modal
+                            i.fa.fa-bug
+                                | &nbsp; Bug
+                    .button-spacer
+                    form.code
+                        .form-group.codeMirrorView
+                            textarea#codeOutput(style='display: none;')
+                    br
+                    #testSuite.negative-10
+                    br
+                    script(type="text/javascript").
+                        var tests = !{JSON.stringify(tests)};
+                        var challengeSeed = !{JSON.stringify(challengeSeed)};
+                        var challenge_Id = !{JSON.stringify(challengeId)};
+                        var challenge_Name = !{JSON.stringify(name)};
+                        var started = Math.floor(Date.now());
+                        var challengeType = !{JSON.stringify(challengeType)};
+                        var _ = R;
+                        var dashed = !{JSON.stringify(dashedName)};
         .col-xs-12.col-sm-12.col-md-8
             .editorScrollDiv(style = "overflow-y: auto; overflow-x: hidden;")
                 #mainEditorPanel