diff --git a/public/css/lib/bootstrap/variables.less b/public/css/lib/bootstrap/variables.less
index 3de76507c7..01e26f3433 100755
--- a/public/css/lib/bootstrap/variables.less
+++ b/public/css/lib/bootstrap/variables.less
@@ -16,7 +16,7 @@
 
 @brand-primary:         #215f1e;
 @brand-success:         #457E86;
-@brand-info:            #5bc0de;
+@brand-info:            #4A2B0F;
 @brand-warning:         #f0ad4e;
 @brand-danger:          #d9534f;
 
diff --git a/public/css/main.less b/public/css/main.less
index cf8b467ed8..5a15dc0f8b 100644
--- a/public/css/main.less
+++ b/public/css/main.less
@@ -543,6 +543,17 @@ thead {
   padding-left: 50px;
 }
 
+.all-list-header {
+  background-color: #4A2B0F;
+  color: #eee;
+  font-size: 36px;
+  text-align: center;
+  margin-bottom: -30px;
+  border-radius: 5px 5px 0px 0px;
+  padding-left: 50px;
+
+}
+
 .closing-x {
   color: #eee;
   font-size: 50px;
diff --git a/public/js/main.js b/public/js/main.js
index 7976c4f6d1..07a805ae9b 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -74,6 +74,11 @@ $(document).ready(function() {
         editor.focus();
     });
 
+    $('#all-bonfires-dialog').on('hidden.bs.modal', function() {
+        editor.focus();
+    });
+
+
     $('#complete-courseware-dialog').on('hidden.bs.modal', function() {
         editor.focus();
     });
@@ -92,13 +97,14 @@ $(document).ready(function() {
                     }
                 })
         }
-    })
+    });
+
 
     $('.all-challenges').on('click', function() {
         $('#all-challenges-dialog').modal('show');
     });
 
-    $('.all-bonfires').on('click', function() {
+    $('#showAllButton').on('click', function() {
         $('#all-bonfires-dialog').modal('show');
     });
 
diff --git a/views/bonfire/show.jade b/views/bonfire/show.jade
index bfa7fdbd77..4c1d217b4c 100644
--- a/views/bonfire/show.jade
+++ b/views/bonfire/show.jade
@@ -79,6 +79,7 @@ block content
                                                 span.ion-help-circled
                                                 | Less information
                 #submitButton.btn.btn-primary.btn-big.btn-block Run code (ctrl + enter)
+                #showAllButton.btn.btn-info.btn-big.btn-block Show all coding challenges
                 br
                 form.code
                     .form-group.codeMirrorView
@@ -133,11 +134,11 @@ block content
                     - else
                         a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress
 
-    //#all-bonfires-dialog.modal(tabindex='-1')
-    //    .modal-dialog.animated.fadeInUp.fast-animation
-    //        .modal-content
-    //            .modal-header.challenge-list-header Bonfires
-    //                a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') ×
-    //            .modal-body
-    //                include ../partials/bonfires
+    #all-bonfires-dialog.modal(tabindex='-1')
+        .modal-dialog.animated.fadeInUp.fast-animation
+            .modal-content
+                .modal-header.all-list-header Bonfires
+                    a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') ×
+                .modal-body
+                    include ../partials/bonfires