diff --git a/client/less/main.less b/client/less/main.less
index a5a7a1ceda..1df2ce5457 100644
--- a/client/less/main.less
+++ b/client/less/main.less
@@ -434,7 +434,6 @@ thead {
 .navbar-right {
   background-color: #215f1e;
   text-align: center;
->>>>>>> start simplifying views
 }
 
 .signup-btn-nav {
diff --git a/server/views/home.jade b/server/views/home.jade
index 0c80370c87..71ba6f5efd 100644
--- a/server/views/home.jade
+++ b/server/views/home.jade
@@ -88,13 +88,13 @@ block content
             h2 Here's why you should join our open source community right now:
             .spacer
             ul.large-li
-                li.ion-code   You'll get help in real time from our community chat rooms.
-                li.ion-code   You'll meet up with other coders in your city.
-                li.ion-code   You'll learn to code at your own pace, in your browser or on your phone.
-                li.ion-code   You'll work through our focused, interactive courses and tutorials.
-                li.ion-code   You'll learn state-of-the-art full stack JavaScript technologies.
-                li.ion-code   You'll build projects that help nonprofits carry out their missions more effectively.
-                li.ion-code   You'll assemble a portfolio of real apps used by real people.
+                li.ion-code.large-p   You'll get help in real time from our community chat rooms.
+                li.ion-code.large-p   You'll meet up with other coders in your city.
+                li.ion-code.large-p   You'll learn to code at your own pace, in your browser or on your phone.
+                li.ion-code.large-p   You'll work through our focused, interactive courses and tutorials.
+                li.ion-code.large-p   You'll learn state-of-the-art full stack JavaScript technologies.
+                li.ion-code.large-p   You'll build projects that help nonprofits carry out their missions more effectively.
+                li.ion-code.large-p   You'll assemble a portfolio of real apps used by real people.
         .big-break
         .row
             .col-xs-12.col-sm-8.col-sm-offset-2
diff --git a/server/views/nonprofits/show.jade b/server/views/nonprofits/show.jade
new file mode 100644
index 0000000000..18b5e261b3
--- /dev/null
+++ b/server/views/nonprofits/show.jade
@@ -0,0 +1,75 @@
+extends ../layout
+block content
+    script.
+        var challengeName = 'Nonprofits View';
+    .row
+        .col-xs-12.col-sm-10.col-sm-offset-1
+            .row
+                .col-xs-12
+                    img.img-center.img-responsive(src=imageUrl)
+            .spacer
+            .row
+                .col-xs-12.col-sm-4
+                    img.img-responsive(src=logoUrl)
+                .col-xs-12.col-sm-8
+                    .col-xs-12
+                        h4= whatDoesNonprofitDo
+                        h4
+                            a(href=websiteLink)= websiteLink
+                    .spacer
+                    h3 Project Description:
+                    .col-xs-12
+                        h4.negative-15 #{projectDescription} (About #{estimatedHours} hours per camper)
+                    .spacer
+                    h3 This project involves building:
+                        h4.negative-15.col-xs-12
+                            if (approvedWebsite)
+                                .ion-android-globe   Website
+                            if (approvedDonor)
+                                .ion-card   Donor Management System
+                            if (approvedInventory)
+                                .ion-ios-box   Inventory Management System
+                            if (approvedVolunteer)
+                                .ion-android-calendar   Volunteer Management System
+                            if (approvedForm)
+                                .ion-ios-list   Webform
+                            if (approvedCommunity)
+                                .ion-ios-people   Community Management System
+                            if (approvedELearning)
+                                .ion-university   E-learning Platform
+                            if (approvedOther)
+                                .ion-settings   Other tools
+                    h3 Project Status: #{currentStatus}
+                    if (moneySaved > 0)
+                        h3.text-primary Estimated Cost Savings for Nonprofit: $#{moneySaved.toString().replace(/000$/, ',000')}
+
+                    if (interestedCampers && interestedCampers.length > 0)
+                        h3 Interested campers:
+                        .col-xs-12.text-left
+                            for interestedCamper in interestedCampers
+                                a(href='/' + interestedCamper.username class="interested-camper-image")
+                                    img.profile-picture.float-right(src=interestedCamper.picture)
+                    if (assignedCampers && assignedCampers.length > 0)
+                        h3 Assigned campers:
+                        .col-xs-12.text-left
+                        for assignedCamper in assignedCampers
+                            a(href='/' + assignedCamper.username class="interested-camper-image")
+                                img.profile-picture.float-right(src=assignedCamper.picture)
+    if (!buttonActive)
+        .col-xs-12.col-sm-8.col-sm-offset-2
+            .text-center
+                if !user
+                    a.btn.btn-cta.signup-btn.btn-block(href="/login") Start learning to code (it's free)
+                    .button-spacer
+                else
+                    a.btn.btn-primary.btn-big.btn-block.disabled(href='/nonprofits/interested-in-nonprofit/#{dashedName}') I'm interested in building this project *
+                    p * Complete all our Bonfires, Ziplines, and Basejumps to unlock this.
+                a.btn.btn-info.btn-big.btn-block(href='/nonprofits/directory') Show all Nonprofit Projects
+                .spacer
+    if (buttonActive)
+        .col-xs-12.col-sm-8.col-sm-offset-2
+            .text-center
+                a.btn.btn-primary.btn-big.btn-block(href='/nonprofits/interested-in-nonprofit/#{dashedName}') I'm interested in building this project
+                .button-spacer
+                a.btn.btn-info.btn-big.btn-block(href='/nonprofits/directory') Show all Nonprofit Projects
+                .spacer