diff --git a/seed_data/wikis.json b/seed_data/wikis.json
index 1236041247..aa0165b7d9 100644
--- a/seed_data/wikis.json
+++ b/seed_data/wikis.json
@@ -1,11 +1,32 @@
 [
   {
     "_id": "bd7158d9c441eddfaeb5bdef",
-    "name": "A Guide to our Wiki",
+    "name": "How do I use this guide?",
     "description": [
       "<div class=\"col-xs-12 col-sm-10 col-sm-offset-1\">",
-      "<h2 class='text-center'>We have a variety of resources to answer your many questions.</h2>",
-      "<h3 class='text-center'>Click the \"Show all Wiki Articles\" button below and browse the topics we cover</h3>"
+      "<h2 class='text-left'>This guide will answer your questions about learning to code and getting a coding job.</h2>",
+      "<h3 class='text-left'>You can click </h3>",
+      "<h3 class='text-center'>Click the \"Show all Articles\" button below and browse the topics we cover</h3>"
+    ]
+  },
+  {
+    "_id": "bd7158d9c541eddfaeb5bdef",
+    "name": "Will I be able to get a job after this?",
+    "description": [
+      "<div class=\"col-xs-12 col-sm-10 col-sm-offset-1\">",
+      "<h2 class='text-left'>This guide will answer your questions about learning to code and getting a coding job.</h2>",
+      "<h3 class='text-left'>You can click </h3>",
+      "<h3 class='text-center'>Click the \"Show all Articles\" button below and browse the topics we cover</h3>"
+    ]
+  },
+  {
+    "_id": "bd7158d9c542eddfaeb5bdef",
+    "name": "How do I use this guide?",
+    "description": [
+      "<div class=\"col-xs-12 col-sm-10 col-sm-offset-1\">",
+      "<h2 class='text-left'>This guide will answer your questions about learning to code and getting a coding job.</h2>",
+      "<h3 class='text-left'>You can click </h3>",
+      "<h3 class='text-center'>Click the \"Show all Articles\" button below and browse the topics we cover</h3>"
     ]
   },
   {
@@ -44,7 +65,7 @@
   },
   {
     "_id": "bd7158d9c439eddfaeb5bdef",
-    "name": "Will I be ready to get a software engineer job after this?",
+    "name": "Will I be ready to get a coding job after this?",
     "description": [
       "<div class=\"text-left col-xs-12 col-md-10 col-md-offset-1\">",
       "    <p class=\"landing-p\">At the end of Free Code Camp, you will have pair programmed around 1,000 hours with dozens of other students, built a portfolio of projects that people are actively using, and a roster of glowing references from nonprofits you've helped. This is more coding than most coding bootcamps provide, and on average, 75% of bootcamp graduates get software engineering jobs within 6 months, and earn an average annual salary of $76,000.</p>",
diff --git a/views/challengeMap/show.jade b/views/challengeMap/show.jade
index 78a93f1791..32fea1f462 100644
--- a/views/challengeMap/show.jade
+++ b/views/challengeMap/show.jade
@@ -5,57 +5,66 @@ block content
             .panel-heading.text-center
                 h1 Challenge Map
             .panel-body
-                .col-md-offset-2
-                    h2
-                        span.fa.fa-flag
-                        | &nbsp; Waypoints
+                .row
+                    .col-xs-12.col-sm-12.col-md-8.col-md-offset-2
+                        h3 We strongly recommend you complete these in order. All of these must be completed before you can start working on nonprofit projects.
+                        h2
+                            span.fa.fa-flag
+                            | &nbsp; Waypoints (web development lessons)
 
-                    .col-xs-12
-                        h3.negative-15
-                            ol
-                                for waypoint in waypoints
-                                    if completedCoursewareList.indexOf(waypoint._id) > -1
-                                        li.strikethrough
-                                            a(href="/challenges/#{waypoint.name}")= waypoint.name
-                                    else
-                                        li
-                                            a(href="/challenges/#{waypoint.name}")= waypoint.name
-                    h2
-                        span.ion-bonfire
-                        | &nbsp; Bonfires
-                    .col-xs-12
-                        h3.negative-15
-                            ol
-                                for bonfire in bonfires
-                                    if completedBonfireList.indexOf(bonfire._id) > -1
-                                        li.strikethrough
-                                            a(href="/bonfires/#{bonfire.name}")= bonfire.name
-                                    else
-                                        li
-                                            a(href="/bonfires/#{bonfire.name}")= bonfire.name
-                    h2
-                        span.fa.fa-angle-double-right
-                        | &nbsp; Ziplines
-                    .col-xs-12
-                        h3.negative-15
-                            ol
-                                for zipline in ziplines
-                                    if completedCoursewareList.indexOf(zipline._id) > -1
-                                        li.strikethrough
-                                            a(href="/challenges/#{zipline.name}")= zipline.name
-                                    else
-                                        li
-                                            a(href="/challenges/#{zipline.name}")= zipline.name
-                    h2
-                        span.fa.fa-level-down
-                        | &nbsp; Basejumps
-                    .col-xs-12
-                        h3.negative-15
-                            ol
-                                for basejump in basejumps
-                                    if completedCoursewareList.indexOf(basejump._id) > -1
-                                        li.strikethrough
-                                            a(href="/challenges/#{basejump.name}")= basejump.name
-                                    else
-                                        li
-                                            a(href="/challenges/#{basejump.name}")= basejump.name
+                        .col-xs-12
+                            h3.negative-15
+                                ol
+                                    for waypoint in waypoints
+                                        if completedCoursewareList.indexOf(waypoint._id) > -1
+                                            li.strikethrough
+                                                a(href="/challenges/#{waypoint.name}")= waypoint.name
+                                        else
+                                            li
+                                                a(href="/challenges/#{waypoint.name}")= waypoint.name
+                        h2
+                            span.ion-bonfire
+                            | &nbsp; Bonfires (algorithm practice)
+                        .col-xs-12
+                            h3.negative-15
+                                ol
+                                    for bonfire in bonfires
+                                        if completedBonfireList.indexOf(bonfire._id) > -1
+                                            li.strikethrough
+                                                a(href="/bonfires/#{bonfire.name}")= bonfire.name
+                                        else
+                                            li
+                                                a(href="/bonfires/#{bonfire.name}")= bonfire.name
+                        h2
+                            span.fa.fa-angle-double-right
+                            | &nbsp; Ziplines (front end development practice)
+                        .col-xs-12
+                            h3.negative-15
+                                ol
+                                    for zipline in ziplines
+                                        if completedCoursewareList.indexOf(zipline._id) > -1
+                                            li.strikethrough
+                                                a(href="/challenges/#{zipline.name}")= zipline.name
+                                        else
+                                            li
+                                                a(href="/challenges/#{zipline.name}")= zipline.name
+                        h2
+                            span.fa.fa-level-down
+                            | &nbsp; Basejumps (full stack development practice)
+                        .col-xs-12
+                            h3.negative-15
+                                ol
+                                    for basejump in basejumps
+                                        if completedCoursewareList.indexOf(basejump._id) > -1
+                                            li.strikethrough
+                                                a(href="/challenges/#{basejump.name}")= basejump.name
+                                        else
+                                            li
+                                                a(href="/challenges/#{basejump.name}")= basejump.name
+                        h2
+                            span.ion-ios-heart
+                            | &nbsp; Nonprofit Projects
+                            h3.negative-15
+                                ul
+                                    li
+                                        a(href="/nonprofits/index") Browse our nonprofit projects
diff --git a/views/partials/navbar.jade b/views/partials/navbar.jade
index a71cb7a0fd..17901f93ca 100644
--- a/views/partials/navbar.jade
+++ b/views/partials/navbar.jade
@@ -18,7 +18,7 @@
         li
             a(href='/stories/hot') News
         li
-            a(href='/wiki') Wiki
+            a(href='/wiki') Field Guide
         if !user
             li &thinsp; &thinsp; &thinsp;
             li