diff --git a/views/challenges/show.jade b/views/challenges/show.jade
index 13251ef9c3e..6afb19d44e3 100644
--- a/views/challenges/show.jade
+++ b/views/challenges/show.jade
@@ -15,15 +15,6 @@ block content
                     .btn.btn-primary.btn-big.btn-block.completed-challenge I've completed this challenge
                     .ten-pixel-break
                     .btn.btn-success.btn-large.btn-block.skip-challenge I want to skip this challenge for now
-                - if (points && points > 2 || !cc)
-                    .panel-footer.text-center
-                        span Need a break? Check out our: 
-                        a(href="https://gitter.im/FreeCodeCamp/FreeCodeCamp", target="_blank") Chat Room
-                        |  , 
-                        a(href="http://blog.freecodecamp.com", target="_blank") Blog
-                        |  , or 
-                        a(href="http://forum.freecodecamp.com", target="_blank") Forum
-                        | .
                 #complete-dialog.modal
                     .modal-dialog.animated.zoomIn.fast-animation
                         .modal-content
diff --git a/views/partials/navbar.jade b/views/partials/navbar.jade
index d60a4226016..b2e178d5051 100644
--- a/views/partials/navbar.jade
+++ b/views/partials/navbar.jade
@@ -12,20 +12,20 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
       ul.nav.navbar-nav.navbar-right
         li
           a(href='/') Challenges
-        - if (cc && cc[1] < 1)
+        - if (!cc || (cc && cc[1]) < 1)
           li
             a(href='/challenges/1') Chat
         - else
           li
-            a(href='http://chat.freecodecamp.com') Chat
-        - if (cc && cc[2] < 1)
+            a(href='http://chat.freecodecamp.com' target='_blank') Chat
+        - if (!cc || (cc && cc[2]) < 1)
           li
             a(href='/challenges/2') Forum
         - else
           li
-            a(href='http://forum.freecodecamp.com') Forum
+            a(href='http://forum.freecodecamp.com' target='_blank') Forum
         li
-          a(href='/learn-to-code') About
+          a(href='/about') About
         if !user
           li
             a.btn.signup-btn.signup-btn-nav(href='/login') Sign in