diff --git a/controllers/resources.js b/controllers/resources.js
index f246707f44..fb38abeeeb 100644
--- a/controllers/resources.js
+++ b/controllers/resources.js
@@ -177,13 +177,13 @@ module.exports = {
                 req.user.save();
             }
         }
-        var date1 = new Date("10/15/2014");
+        var date1 = new Date('10/15/2014');
         var date2 = new Date();
         var progressTimestamps = req.user.progressTimestamps;
         var now = Date.now() / 1000 | 0;
         if (req.user.pointsNeedMigration) {
             var challengesHash = req.user.challengesHash;
-            for(var key in challengesHash) {
+            for (var key in challengesHash) {
                 if (challengesHash[key] > 0) {
                     req.user.progressTimestamps.push(challengesHash[key]);
                 }
@@ -270,6 +270,11 @@ module.exports = {
         });
     },
 
+    getAllCourses: function() {
+      "use strict";
+      return coursewares;
+    },
+
     allCoursewareIds: function() {
         return coursewares.map(function(elem) {
             return {
diff --git a/controllers/user.js b/controllers/user.js
index e30485cfb0..b2411c76e5 100644
--- a/controllers/user.js
+++ b/controllers/user.js
@@ -1,14 +1,14 @@
 var _ = require('lodash'),
-    async = require('async'),
-    crypto = require('crypto'),
-    nodemailer = require('nodemailer'),
-    passport = require('passport'),
-    User = require('../models/User'),
-    secrets = require('../config/secrets'),
-    moment = require('moment'),
-    Challenge = require('./../models/Challenge'),
-    debug = require('debug')('freecc:cntr:challenges'),
-    resources = require('./resources');
+  async = require('async'),
+  crypto = require('crypto'),
+  nodemailer = require('nodemailer'),
+  passport = require('passport'),
+  User = require('../models/User'),
+  secrets = require('../config/secrets'),
+  moment = require('moment'),
+  Challenge = require('./../models/Challenge'),
+  debug = require('debug')('freecc:cntr:challenges'),
+  resources = require('./resources');
 
 
 
@@ -18,10 +18,10 @@ var _ = require('lodash'),
  */
 
 exports.getSignin = function(req, res) {
-    if (req.user) return res.redirect('/');
-    res.render('account/signin', {
-        title: 'Free Code Camp Login'
-    });
+  if (req.user) return res.redirect('/');
+  res.render('account/signin', {
+    title: 'Free Code Camp Login'
+  });
 };
 
 /**
@@ -30,28 +30,28 @@ exports.getSignin = function(req, res) {
  */
 
 exports.postSignin = function(req, res, next) {
-    req.assert('email', 'Email is not valid').isEmail();
-    req.assert('password', 'Password cannot be blank').notEmpty();
+  req.assert('email', 'Email is not valid').isEmail();
+  req.assert('password', 'Password cannot be blank').notEmpty();
 
-    var errors = req.validationErrors();
+  var errors = req.validationErrors();
 
-    if (errors) {
-        req.flash('errors', errors);
-        return res.redirect('/signin');
+  if (errors) {
+    req.flash('errors', errors);
+    return res.redirect('/signin');
+  }
+
+  passport.authenticate('local', function(err, user, info) {
+    if (err) return next(err);
+    if (!user) {
+      req.flash('errors', { msg: info.message });
+      return res.redirect('/signin');
     }
-
-    passport.authenticate('local', function(err, user, info) {
-        if (err) return next(err);
-        if (!user) {
-            req.flash('errors', { msg: info.message });
-            return res.redirect('/signin');
-        }
-        req.logIn(user, function(err) {
-            if (err) return next(err);
-            req.flash('success', { msg: 'Success! You are logged in.' });
-            res.redirect(req.session.returnTo || '/');
-        });
-    })(req, res, next);
+    req.logIn(user, function(err) {
+      if (err) return next(err);
+      req.flash('success', { msg: 'Success! You are logged in.' });
+      res.redirect(req.session.returnTo || '/');
+    });
+  })(req, res, next);
 };
 
 /**
@@ -60,8 +60,8 @@ exports.postSignin = function(req, res, next) {
  */
 
 exports.signout = function(req, res) {
-    req.logout();
-    res.redirect('/');
+  req.logout();
+  res.redirect('/');
 };
 
 /**
@@ -70,10 +70,10 @@ exports.signout = function(req, res) {
  */
 
 exports.getEmailSignin = function(req, res) {
-    if (req.user) return res.redirect('/');
-    res.render('account/email-signin', {
-        title: 'Sign in to your Free Code Camp Account'
-    });
+  if (req.user) return res.redirect('/');
+  res.render('account/email-signin', {
+    title: 'Sign in to your Free Code Camp Account'
+  });
 };
 
 /**
@@ -82,10 +82,10 @@ exports.getEmailSignin = function(req, res) {
  */
 
 exports.getEmailSignup = function(req, res) {
-    if (req.user) return res.redirect('/');
-    res.render('account/email-signup', {
-        title: 'Create Your Free Code Camp Account'
-    });
+  if (req.user) return res.redirect('/');
+  res.render('account/email-signup', {
+    title: 'Create Your Free Code Camp Account'
+  });
 };
 
 /**
@@ -94,93 +94,93 @@ exports.getEmailSignup = function(req, res) {
  */
 
 exports.postEmailSignup = function(req, res, next) {
-    var errors = req.validationErrors();
+  var errors = req.validationErrors();
 
-    if (errors) {
-        req.flash('errors', errors);
+  if (errors) {
+    req.flash('errors', errors);
+    return res.redirect('/email-signup');
+  }
+
+  var possibleUserData = req.body;
+
+  if (possibleUserData.password.length < 8) {
+    req.flash('errors', {
+      msg: 'Your password is too short'
+    });
+    return res.redirect('email-signup');
+  }
+
+  if (possibleUserData.username.length < 5 || possibleUserData.length > 20) {
+    req.flash('errors', {
+      msg: 'Your username must be between 5 and 20 characters'
+    });
+    return res.redirect('email-signup');
+  }
+
+
+  var user = new User({
+    email: req.body.email.trim(),
+    password: req.body.password,
+    profile : {
+      username: req.body.username.trim(),
+      picture: 'https://s3.amazonaws.com/freecodecamp/camper-image-placeholder.png'
+    }
+  });
+
+  User.findOne({ email: req.body.email }, function(err, existingEmail) {
+    if (err) {
+      return next(err);
+    }
+
+    if (existingEmail) {
+      req.flash('errors', {
+        msg: 'Account with that email address already exists.'
+      });
+      return res.redirect('/email-signup');
+    }
+    User.findOne({'profile.username': req.body.username }, function(err, existingUsername) {
+      if (err) {
+        return next(err);
+      }
+      if (existingUsername) {
+        req.flash('errors', {
+          msg: 'Account with that username already exists.'
+        });
         return res.redirect('/email-signup');
-    }
+      }
 
-    var possibleUserData = req.body;
-
-    if (possibleUserData.password.length < 8) {
-        req.flash('errors', {
-            msg: 'Your password is too short'
+      user.save(function(err) {
+        if (err) { return next(err); }
+        req.logIn(user, function(err) {
+          if (err) { return next(err); }
+          res.redirect('/email-signup');
         });
-        return res.redirect('email-signup');
-    }
-
-    if (possibleUserData.username.length < 5 || possibleUserData.length > 20) {
-        req.flash('errors', {
-            msg: 'Your username must be between 5 and 20 characters'
-        });
-        return res.redirect('email-signup');
-    }
-
-
-    var user = new User({
-        email: req.body.email.trim(),
-        password: req.body.password,
-        profile : {
-            username: req.body.username.trim(),
-            picture: 'https://s3.amazonaws.com/freecodecamp/camper-image-placeholder.png'
+      });
+      var transporter = nodemailer.createTransport({
+        service: 'Mandrill',
+        auth: {
+          user: secrets.mandrill.user,
+          pass: secrets.mandrill.password
         }
+      });
+      var mailOptions = {
+        to: user.email,
+        from: 'Team@freecodecamp.com',
+        subject: 'Welcome to Free Code Camp!',
+        text: [
+          'Greetings from San Francisco!\n\n',
+          'Thank you for joining our community.\n',
+          'Feel free to email us at this address if you have any questions about Free Code Camp.\n',
+          "And if you have a moment, check out our blog: blog.freecodecamp.com.\n",
+          'Good luck with the challenges!\n\n',
+          '- the Volunteer Camp Counselor Team'
+        ].join('')
+      };
+      transporter.sendMail(mailOptions, function(err) {
+        if (err) { return err; }
+      });
     });
-
-    User.findOne({ email: req.body.email }, function(err, existingEmail) {
-        if (err) {
-            return next(err);
-        }
-
-        if (existingEmail) {
-            req.flash('errors', {
-                msg: 'Account with that email address already exists.'
-            });
-            return res.redirect('/email-signup');
-        }
-        User.findOne({'profile.username': req.body.username }, function(err, existingUsername) {
-            if (err) {
-                return next(err);
-            }
-            if (existingUsername) {
-                req.flash('errors', {
-                    msg: 'Account with that username already exists.'
-                });
-                return res.redirect('/email-signup');
-            }
-
-            user.save(function(err) {
-                if (err) { return next(err); }
-                req.logIn(user, function(err) {
-                    if (err) { return next(err); }
-                    res.redirect('/email-signup');
-                });
-            });
-            var transporter = nodemailer.createTransport({
-                service: 'Mandrill',
-                auth: {
-                    user: secrets.mandrill.user,
-                    pass: secrets.mandrill.password
-                }
-            });
-            var mailOptions = {
-                to: user.email,
-                from: 'Team@freecodecamp.com',
-                subject: 'Welcome to Free Code Camp!',
-                text: [
-                    'Greetings from San Francisco!\n\n',
-                    'Thank you for joining our community.\n',
-                    'Feel free to email us at this address if you have any questions about Free Code Camp.\n',
-                    "And if you have a moment, check out our blog: blog.freecodecamp.com.\n",
-                    'Good luck with the challenges!\n\n',
-                    '- the Volunteer Camp Counselor Team'
-                ].join('')
-            };
-            transporter.sendMail(mailOptions, function(err) {
-                if (err) { return err; }
-            });
-        });
-    });
+  });
 };
 
 /**
@@ -198,9 +198,9 @@ exports.getStreak = function(req, res) {
  */
 
 exports.getAccount = function(req, res) {
-    res.render('account/account', {
-        title: 'Manage your Free Code Camp Account'
-    });
+  res.render('account/account', {
+    title: 'Manage your Free Code Camp Account'
+  });
 };
 
 /**
@@ -208,9 +208,9 @@ exports.getAccount = function(req, res) {
  */
 
 exports.getAccountAngular = function(req, res) {
-    res.json({
-        user: req.user
-    });
+  res.json({
+    user: req.user
+  });
 };
 
 /**
@@ -218,26 +218,26 @@ exports.getAccountAngular = function(req, res) {
  */
 
 exports.checkUniqueUsername = function(req, res) {
-    User.count({'profile.username': req.params.username.toLowerCase()}, function (err, data) {
-        if (data == 1) {
-            return res.send(true);
-        } else {
-            return res.send(false);
-        }
-    });
+  User.count({'profile.username': req.params.username.toLowerCase()}, function (err, data) {
+    if (data == 1) {
+      return res.send(true);
+    } else {
+      return res.send(false);
+    }
+  });
 };
 
 /**
  * Existing username check
  */
 exports.checkExistingUsername = function(req, res) {
-    User.count({'profile.username': req.params.username.toLowerCase()}, function (err, data) {
-        if (data === 1) {
-            return res.send(true);
-        } else {
-            return res.send(false);
-        }
-    });
+  User.count({'profile.username': req.params.username.toLowerCase()}, function (err, data) {
+    if (data === 1) {
+      return res.send(true);
+    } else {
+      return res.send(false);
+    }
+  });
 };
 
 /**
@@ -245,13 +245,13 @@ exports.checkExistingUsername = function(req, res) {
  */
 
 exports.checkUniqueEmail = function(req, res) {
-    User.count({'email': decodeURIComponent(req.params.email).toLowerCase()}, function (err, data) {
-        if (data == 1) {
-            return res.send(true);
-        } else {
-            return res.send(false);
-        }
-    });
+  User.count({'email': decodeURIComponent(req.params.email).toLowerCase()}, function (err, data) {
+    if (data === 1) {
+      return res.send(true);
+    } else {
+      return res.send(false);
+    }
+  });
 };
 
 
@@ -265,43 +265,41 @@ exports.returnUser = function(req, res, next) {
     if (err) { debug('Username err: ', err); next(err); }
     if (user[0]) {
       var user = user[0];
-      Challenge.find({}, null, {sort: {challengeNumber: 1}}, function (err, c) {
-        data = {};
-        progressTimestamps = user.progressTimestamps;
-        // dummy data to experiment with visualizations
-        progressTimestamps = [1417117319, 1384091493, 1367893914, 1411547157, 1366875140, 1382614404, 1374973026, 1363495510, 1372229313, 1389795294, 1393820136, 1395425437, 1383366211, 1402063449, 1368384561, 1413460738, 1390013511, 1408510076, 1395530419, 1391588683, 1410480320, 1360219531, 1367248635, 1408531181, 1374214772, 1424038529, 1387468139, 1381934158, 1409278748, 1390696161, 1415933043, 1389573689, 1395703336, 1401223291, 1375539279, 1371229698, 1371990948, 1422236826, 1363017438, 1359619855, 1364850739, 1401982108, 1381270295, 1420063854, 1406540493, 1409122251, 1360775035, 1367712723, 1395305605, 1382037418, 1378402477, 1377563090, 1398930836, 1417371909, 1377417393, 1423763002, 1357511908, 1377375961, 1388374304, 1406416407, 1399463258, 1422593990, 1383434425, 1420200570, 1379435518, 1414512582, 1416263148, 1398635260, 1381815565, 1369178539, 1378414973, 1394409827, 1398463526, 1379564971, 1385849279, 1392899666, 1367053659, 1417730793, 1400112915, 1379923357, 1417768487, 1415779985, 1416150640, 1399820237, 1370498715, 1374800622, 1363924512, 1402497668, 1400146327, 1362456746, 1394935898, 1414980963, 1413942775, 1367606840, 1387144705, 1407906392, 1417213587, 1422640891, 1414033139, 1365323522, 1424661148];
-        for (i = 0; i < progressTimestamps.length; i++) {
-          data[progressTimestamps[i].toString()] = 1;
-        }
 
+      var data = {};
+      var progressTimestamps = user.progressTimestamps;
+      for (var i = 0; i < progressTimestamps.length; i++) {
+        data[progressTimestamps[i].toString()] = 1;
+      }
 
-        res.render('account/show', {
-          title: 'Camper: ',
-          username: user.profile.username,
-          name: user.profile.name,
-          location: user.profile.location,
-          githubProfile: user.profile.githubProfile,
-          linkedinProfile: user.profile.linkedinProfile,
-          codepenProfile: user.profile.codepenProfile,
-          twitterHandle: user.profile.twitterHandle,
-          bio: user.profile.bio,
-          picture: user.profile.picture,
-          progressTimestamps: req.user.progressTimestamps,
-          points: user.progressTimestamps,
-          website1Link: user.portfolio.website1Link,
-          website1Title: user.portfolio.website1Title,
-          website1Image: user.portfolio.website1Image,
-          website2Link: user.portfolio.website2Link,
-          website2Title: user.portfolio.website2Title,
-          website2Image: user.portfolio.website2Image,
-          website3Link: user.portfolio.website3Link,
-          website3Title: user.portfolio.website3Title,
-          website3Image: user.portfolio.website3Image,
-          challenges: c,
-          calender: data,
-          moment: moment
-        });
+      res.render('account/show', {
+        title: 'Camper ' + user.profile.username + '\'s portfolio',
+        username: user.profile.username,
+        name: user.profile.name,
+        location: user.profile.location,
+        githubProfile: user.profile.githubProfile,
+        linkedinProfile: user.profile.linkedinProfile,
+        codepenProfile: user.profile.codepenProfile,
+        twitterHandle: user.profile.twitterHandle,
+        bio: user.profile.bio,
+        picture: user.profile.picture,
+        progressTimestamps: user.progressTimestamps,
+        points: user.progressTimestamps.length,
+        website1Link: user.portfolio.website1Link,
+        website1Title: user.portfolio.website1Title,
+        website1Image: user.portfolio.website1Image,
+        website2Link: user.portfolio.website2Link,
+        website2Title: user.portfolio.website2Title,
+        website2Image: user.portfolio.website2Image,
+        website3Link: user.portfolio.website3Link,
+        website3Title: user.portfolio.website3Title,
+        website3Image: user.portfolio.website3Image,
+        challenges: resources.getAllCourses(),
+        ch: user.challengesHash,
+        calender: data,
+        moment: moment
       });
+
     } else {
       req.flash('errors', {
         msg: "404: We couldn't find a page with that url. Please double check the link."
@@ -309,45 +307,6 @@ exports.returnUser = function(req, res, next) {
       return res.redirect('/');
     }
   });
-
-    User.find({'profile.username': req.params.username.toLowerCase()}, function(err, user) {
-        if (err) { debug('Username err: ', err); next(err); }
-        if (user[0]) {
-            var user = user[0];
-            Challenge.find({}, null, {sort: {challengeNumber: 1}}, function (err, c) {
-                res.render('account/show', {
-                    title: 'Camper ' + user.profile.username + '\'s portfolio',
-                    username: user.profile.username,
-                    name: user.profile.name,
-                    location: user.profile.location,
-                    githubProfile: user.profile.githubProfile,
-                    linkedinProfile: user.profile.linkedinProfile,
-                    codepenProfile: user.profile.codepenProfile,
-                    twitterHandle: user.profile.twitterHandle,
-                    bio: user.profile.bio,
-                    picture: user.profile.picture,
-                    points: user.points,
-                    website1Link: user.portfolio.website1Link,
-                    website1Title: user.portfolio.website1Title,
-                    website1Image: user.portfolio.website1Image,
-                    website2Link: user.portfolio.website2Link,
-                    website2Title: user.portfolio.website2Title,
-                    website2Image: user.portfolio.website2Image,
-                    website3Link: user.portfolio.website3Link,
-                    website3Title: user.portfolio.website3Title,
-                    website3Image: user.portfolio.website3Image,
-                    challenges: c,
-                    ch: user.challengesHash,
-                    moment: moment
-                });
-            });
-        } else {
-            req.flash('errors', {
-                msg: "404: We couldn't find a page with that url. Please double check the link."
-            });
-            return res.redirect('/');
-        }
-    });
 };
 
 
@@ -357,20 +316,20 @@ exports.returnUser = function(req, res, next) {
  */
 
 exports.updateProgress = function(req, res) {
-    User.findById(req.user.id, function(err, user) {
-        if (err) return next(err);
-        user.email = req.body.email || '';
-        user.profile.name = req.body.name || '';
-        user.profile.gender = req.body.gender || '';
-        user.profile.location = req.body.location || '';
-        user.profile.website = req.body.website || '';
+  User.findById(req.user.id, function(err, user) {
+    if (err) return next(err);
+    user.email = req.body.email || '';
+    user.profile.name = req.body.name || '';
+    user.profile.gender = req.body.gender || '';
+    user.profile.location = req.body.location || '';
+    user.profile.website = req.body.website || '';
 
-        user.save(function(err) {
-            if (err) return next(err);
-            req.flash('success', { msg: 'Profile information updated.' });
-            res.redirect('/account');
-        });
+    user.save(function(err) {
+      if (err) return next(err);
+      req.flash('success', { msg: 'Profile information updated.' });
+      res.redirect('/account');
     });
+  });
 };
 
 /**
@@ -380,77 +339,77 @@ exports.updateProgress = function(req, res) {
 
 exports.postUpdateProfile = function(req, res, next) {
 
-    User.findById(req.user.id, function(err, user) {
-        if (err) return next(err);
-        var errors = req.validationErrors();
-        if (errors) {
-            req.flash('errors', errors);
-            return res.redirect('/account');
-        }
+  User.findById(req.user.id, function(err, user) {
+    if (err) return next(err);
+    var errors = req.validationErrors();
+    if (errors) {
+      req.flash('errors', errors);
+      return res.redirect('/account');
+    }
 
-        User.findOne({ email: req.body.email }, function(err, existingEmail) {
-            if (err) {
-                return next(err);
-            }
-            var user = req.user;
-            if (existingEmail && existingEmail.email != user.email) {
-                req.flash('errors', {
-                    msg: "An account with that email address already exists."
-                });
-                return res.redirect('/account');
-            }
-            User.findOne({ 'profile.username': req.body.username }, function(err, existingUsername) {
-                if (err) {
-                    return next(err);
-                }
-                var user = req.user;
-                if (existingUsername && existingUsername.profile.username !== user.profile.username) {
-                    req.flash('errors', {
-                        msg: 'An account with that username already exists.'
-                    });
-                    return res.redirect('/account');
-                }
-                user.email = req.body.email.trim() || '';
-                user.profile.name = req.body.name.trim() || '';
-                user.profile.username = req.body.username.trim() || '';
-                user.profile.location = req.body.location.trim() || '';
-                user.profile.githubProfile = req.body.githubProfile.trim() || '';
-                user.profile.linkedinProfile = req.body.linkedinProfile.trim() || '';
-                user.profile.codepenProfile = req.body.codepenProfile.trim() || '';
-                user.profile.twitterHandle = req.body.twitterHandle.trim() || '';
-                user.profile.bio = req.body.bio.trim() || '';
-                user.profile.picture = req.body.picture.trim() || 'https://s3.amazonaws.com/freecodecamp/camper-image-placeholder.png';
-                user.portfolio.website1Title = req.body.website1Title.trim() || '';
-                user.portfolio.website1Link = req.body.website1Link.trim() || '';
-                user.portfolio.website1Image = req.body.website1Image.trim() || '';
-                user.portfolio.website2Title = req.body.website2Title.trim() || '';
-                user.portfolio.website2Link = req.body.website2Link.trim() || '';
-                user.portfolio.website2Image = req.body.website2Image.trim() || '';
-                user.portfolio.website3Title = req.body.website3Title.trim() || '';
-                user.portfolio.website3Link = req.body.website3Link.trim() || '';
-                user.portfolio.website3Image = req.body.website3Image.trim() || '';
-
-
-                user.save(function (err) {
-                    if (err) {
-                        return next(err);
-                    }
-                    resources.updateUserStoryPictures(
-                      user._id.toString(),
-                      user.profile.picture,
-                      user.profile.username,
-                      function(err) {
-                        if (err) { return next(err); }
-                        req.flash('success', {
-                          msg: 'Profile information updated.'
-                        });
-                        res.redirect('/account');
-                      }
-                    );
-                });
-            });
+    User.findOne({ email: req.body.email }, function(err, existingEmail) {
+      if (err) {
+        return next(err);
+      }
+      var user = req.user;
+      if (existingEmail && existingEmail.email != user.email) {
+        req.flash('errors', {
+          msg: "An account with that email address already exists."
         });
+        return res.redirect('/account');
+      }
+      User.findOne({ 'profile.username': req.body.username }, function(err, existingUsername) {
+        if (err) {
+          return next(err);
+        }
+        var user = req.user;
+        if (existingUsername && existingUsername.profile.username !== user.profile.username) {
+          req.flash('errors', {
+            msg: 'An account with that username already exists.'
+          });
+          return res.redirect('/account');
+        }
+        user.email = req.body.email.trim() || '';
+        user.profile.name = req.body.name.trim() || '';
+        user.profile.username = req.body.username.trim() || '';
+        user.profile.location = req.body.location.trim() || '';
+        user.profile.githubProfile = req.body.githubProfile.trim() || '';
+        user.profile.linkedinProfile = req.body.linkedinProfile.trim() || '';
+        user.profile.codepenProfile = req.body.codepenProfile.trim() || '';
+        user.profile.twitterHandle = req.body.twitterHandle.trim() || '';
+        user.profile.bio = req.body.bio.trim() || '';
+        user.profile.picture = req.body.picture.trim() || 'https://s3.amazonaws.com/freecodecamp/camper-image-placeholder.png';
+        user.portfolio.website1Title = req.body.website1Title.trim() || '';
+        user.portfolio.website1Link = req.body.website1Link.trim() || '';
+        user.portfolio.website1Image = req.body.website1Image.trim() || '';
+        user.portfolio.website2Title = req.body.website2Title.trim() || '';
+        user.portfolio.website2Link = req.body.website2Link.trim() || '';
+        user.portfolio.website2Image = req.body.website2Image.trim() || '';
+        user.portfolio.website3Title = req.body.website3Title.trim() || '';
+        user.portfolio.website3Link = req.body.website3Link.trim() || '';
+        user.portfolio.website3Image = req.body.website3Image.trim() || '';
+
+
+        user.save(function (err) {
+          if (err) {
+            return next(err);
+          }
+          resources.updateUserStoryPictures(
+            user._id.toString(),
+            user.profile.picture,
+            user.profile.username,
+            function(err) {
+              if (err) { return next(err); }
+              req.flash('success', {
+                msg: 'Profile information updated.'
+              });
+              res.redirect('/account');
+            }
+          );
+        });
+      });
     });
+  });
 };
 
 /**
@@ -459,29 +418,29 @@ exports.postUpdateProfile = function(req, res, next) {
  */
 
 exports.postUpdatePassword = function(req, res, next) {
-    req.assert('password', 'Password must be at least 4 characters long').len(4);
-    req.assert('confirmPassword', 'Passwords do not match')
-        .equals(req.body.password);
+  req.assert('password', 'Password must be at least 4 characters long').len(4);
+  req.assert('confirmPassword', 'Passwords do not match')
+    .equals(req.body.password);
 
-    var errors = req.validationErrors();
+  var errors = req.validationErrors();
 
-    if (errors) {
-        req.flash('errors', errors);
-        return res.redirect('/account');
-    }
+  if (errors) {
+    req.flash('errors', errors);
+    return res.redirect('/account');
+  }
 
-    User.findById(req.user.id, function(err, user) {
-        if (err) { return next(err); }
+  User.findById(req.user.id, function(err, user) {
+    if (err) { return next(err); }
 
-        user.password = req.body.password;
+    user.password = req.body.password;
 
-        user.save(function(err) {
-            if (err) { return next(err); }
+    user.save(function(err) {
+      if (err) { return next(err); }
 
-            req.flash('success', { msg: 'Password has been changed.' });
-            res.redirect('/account');
-        });
+      req.flash('success', { msg: 'Password has been changed.' });
+      res.redirect('/account');
     });
+  });
 };
 
 /**
@@ -490,12 +449,12 @@ exports.postUpdatePassword = function(req, res, next) {
  */
 
 exports.postDeleteAccount = function(req, res, next) {
-    User.remove({ _id: req.user.id }, function(err) {
-        if (err) { return next(err); }
-        req.logout();
-        req.flash('info', { msg: 'Your account has been deleted.' });
-        res.redirect('/');
-    });
+  User.remove({ _id: req.user.id }, function(err) {
+    if (err) { return next(err); }
+    req.logout();
+    req.flash('info', { msg: 'Your account has been deleted.' });
+    res.redirect('/');
+  });
 };
 
 /**
@@ -504,22 +463,22 @@ exports.postDeleteAccount = function(req, res, next) {
  */
 
 exports.getOauthUnlink = function(req, res, next) {
-    var provider = req.params.provider;
-    User.findById(req.user.id, function(err, user) {
-        if (err) { return next(err); }
+  var provider = req.params.provider;
+  User.findById(req.user.id, function(err, user) {
+    if (err) { return next(err); }
 
-        user[provider] = undefined;
-        user.tokens =
-            _.reject(user.tokens, function(token) {
-                return token.kind === provider;
-            });
+    user[provider] = undefined;
+    user.tokens =
+      _.reject(user.tokens, function(token) {
+        return token.kind === provider;
+      });
 
-        user.save(function(err) {
-            if (err) { return next(err); }
-            req.flash('info', { msg: provider + ' account has been unlinked.' });
-            res.redirect('/account');
-        });
+    user.save(function(err) {
+      if (err) { return next(err); }
+      req.flash('info', { msg: provider + ' account has been unlinked.' });
+      res.redirect('/account');
     });
+  });
 };
 
 /**
@@ -528,25 +487,25 @@ exports.getOauthUnlink = function(req, res, next) {
  */
 
 exports.getReset = function(req, res) {
-    if (req.isAuthenticated()) {
-        return res.redirect('/');
-    }
-    User
-        .findOne({ resetPasswordToken: req.params.token })
-        .where('resetPasswordExpires').gt(Date.now())
-        .exec(function(err, user) {
-            if (err) { return next(err); }
-            if (!user) {
-                req.flash('errors', {
-                    msg: 'Password reset token is invalid or has expired.'
-                });
-                return res.redirect('/forgot');
-            }
-            res.render('account/reset', {
-                title: 'Password Reset',
-                token: req.params.token
-            });
+  if (req.isAuthenticated()) {
+    return res.redirect('/');
+  }
+  User
+    .findOne({ resetPasswordToken: req.params.token })
+    .where('resetPasswordExpires').gt(Date.now())
+    .exec(function(err, user) {
+      if (err) { return next(err); }
+      if (!user) {
+        req.flash('errors', {
+          msg: 'Password reset token is invalid or has expired.'
         });
+        return res.redirect('/forgot');
+      }
+      res.render('account/reset', {
+        title: 'Password Reset',
+        token: req.params.token
+      });
+    });
 };
 
 /**
@@ -555,72 +514,72 @@ exports.getReset = function(req, res) {
  */
 
 exports.postReset = function(req, res, next) {
-    var errors = req.validationErrors();
+  var errors = req.validationErrors();
 
-    if (errors) {
-        req.flash('errors', errors);
-        return res.redirect('back');
-    }
+  if (errors) {
+    req.flash('errors', errors);
+    return res.redirect('back');
+  }
 
-    async.waterfall([
-        function(done) {
-            User
-                .findOne({ resetPasswordToken: req.params.token })
-                .where('resetPasswordExpires').gt(Date.now())
-                .exec(function(err, user) {
-                    if (err) { return next(err); }
-                    if (!user) {
-                        req.flash('errors', {
-                            msg: 'Password reset token is invalid or has expired.'
-                        });
-                        return res.redirect('back');
-                    }
-
-                    user.password = req.body.password;
-                    user.resetPasswordToken = undefined;
-                    user.resetPasswordExpires = undefined;
-
-                    user.save(function(err) {
-                        if (err) { return done(err); }
-                        req.logIn(user, function(err) {
-                            done(err, user);
-                        });
-                    });
-                });
-        },
-        function(user, done) {
-            var transporter = nodemailer.createTransport({
-                service: 'Mandrill',
-                auth: {
-                    user: secrets.mandrill.user,
-                    pass: secrets.mandrill.password
-                }
+  async.waterfall([
+    function(done) {
+      User
+        .findOne({ resetPasswordToken: req.params.token })
+        .where('resetPasswordExpires').gt(Date.now())
+        .exec(function(err, user) {
+          if (err) { return next(err); }
+          if (!user) {
+            req.flash('errors', {
+              msg: 'Password reset token is invalid or has expired.'
             });
-            var mailOptions = {
-                to: user.email,
-                from: 'Team@freecodecamp.com',
-                subject: 'Your Free Code Camp password has been changed',
-                text: [
-                    'Hello,\n\n',
-                    'This email is confirming that you requested to',
-                    'reset your password for your Free Code Camp account.',
-                    'This is your email:',
-                    user.email,
-                    '\n'
-                ].join(' ')
-            };
-            transporter.sendMail(mailOptions, function(err) {
-                if (err) { return done(err); }
-                req.flash('success', {
-                    msg: 'Success! Your password has been changed.'
-                });
-                done();
+            return res.redirect('back');
+          }
+
+          user.password = req.body.password;
+          user.resetPasswordToken = undefined;
+          user.resetPasswordExpires = undefined;
+
+          user.save(function(err) {
+            if (err) { return done(err); }
+            req.logIn(user, function(err) {
+              done(err, user);
             });
+          });
+        });
+    },
+    function(user, done) {
+      var transporter = nodemailer.createTransport({
+        service: 'Mandrill',
+        auth: {
+          user: secrets.mandrill.user,
+          pass: secrets.mandrill.password
         }
-    ], function(err) {
-        if (err) { return next(err); }
-        res.redirect('/');
-    });
+      });
+      var mailOptions = {
+        to: user.email,
+        from: 'Team@freecodecamp.com',
+        subject: 'Your Free Code Camp password has been changed',
+        text: [
+          'Hello,\n\n',
+          'This email is confirming that you requested to',
+          'reset your password for your Free Code Camp account.',
+          'This is your email:',
+          user.email,
+          '\n'
+        ].join(' ')
+      };
+      transporter.sendMail(mailOptions, function(err) {
+        if (err) { return done(err); }
+        req.flash('success', {
+          msg: 'Success! Your password has been changed.'
+        });
+        done();
+      });
+    }
+  ], function(err) {
+    if (err) { return next(err); }
+    res.redirect('/');
+  });
 };
 
 /**
@@ -629,12 +588,12 @@ exports.postReset = function(req, res, next) {
  */
 
 exports.getForgot = function(req, res) {
-    if (req.isAuthenticated()) {
-        return res.redirect('/');
-    }
-    res.render('account/forgot', {
-        title: 'Forgot Password'
-    });
+  if (req.isAuthenticated()) {
+    return res.redirect('/');
+  }
+  res.render('account/forgot', {
+    title: 'Forgot Password'
+  });
 };
 
 /**
@@ -643,80 +602,80 @@ exports.getForgot = function(req, res) {
  */
 
 exports.postForgot = function(req, res, next) {
-    var errors = req.validationErrors();
+  var errors = req.validationErrors();
 
-    if (errors) {
-        req.flash('errors', errors);
-        return res.redirect('/forgot');
-    }
+  if (errors) {
+    req.flash('errors', errors);
+    return res.redirect('/forgot');
+  }
 
-    async.waterfall([
-        function(done) {
-            crypto.randomBytes(16, function(err, buf) {
-                if (err) { return done(err); }
-                var token = buf.toString('hex');
-                done(null, token);
-            });
-        },
-        function(token, done) {
-            User.findOne({
-                email: req.body.email.toLowerCase()
-            }, function(err, user) {
-                if (err) { return done(err); }
-                if (!user) {
-                    req.flash('errors', {
-                        msg: 'No account with that email address exists.'
-                    });
-                    return res.redirect('/forgot');
-                }
-
-                user.resetPasswordToken = token;
-                user.resetPasswordExpires = Date.now() + 3600000; // 1 hour
-
-                user.save(function(err) {
-                    if (err) { return done(err); }
-                    done(null, token, user);
-                });
-            });
-        },
-        function(token, user, done) {
-            var transporter = nodemailer.createTransport({
-                service: 'Mandrill',
-                auth: {
-                    user: secrets.mandrill.user,
-                    pass: secrets.mandrill.password
-                }
-            });
-            var mailOptions = {
-                to: user.email,
-                from: 'Team@freecodecamp.com',
-                subject: 'Reset your Free Code Camp password',
-                text: [
-                    'You are receiving this email because you (or someone else)\n',
-                    'requested we reset your Free Code Camp account\'s password.\n\n',
-                    'Please click on the following link, or paste this into your\n',
-                    'browser to complete the process:\n\n',
-                    'http://',
-                    req.headers.host,
-                    '/reset/',
-                    token,
-                    '\n\n',
-                    'If you did not request this, please ignore this email and\n',
-                    'your password will remain unchanged.\n'
-                ].join('')
-            };
-            transporter.sendMail(mailOptions, function(err) {
-                if (err) { return done(err); }
-                req.flash('info', {
-                    msg: 'An e-mail has been sent to ' +
-                    user.email +
-                    ' with further instructions.'
-                });
-                done(null, 'done');
-            });
+  async.waterfall([
+    function(done) {
+      crypto.randomBytes(16, function(err, buf) {
+        if (err) { return done(err); }
+        var token = buf.toString('hex');
+        done(null, token);
+      });
+    },
+    function(token, done) {
+      User.findOne({
+        email: req.body.email.toLowerCase()
+      }, function(err, user) {
+        if (err) { return done(err); }
+        if (!user) {
+          req.flash('errors', {
+            msg: 'No account with that email address exists.'
+          });
+          return res.redirect('/forgot');
         }
-    ], function(err) {
-        if (err) { return next(err); }
-        res.redirect('/forgot');
-    });
+
+        user.resetPasswordToken = token;
+        user.resetPasswordExpires = Date.now() + 3600000; // 1 hour
+
+        user.save(function(err) {
+          if (err) { return done(err); }
+          done(null, token, user);
+        });
+      });
+    },
+    function(token, user, done) {
+      var transporter = nodemailer.createTransport({
+        service: 'Mandrill',
+        auth: {
+          user: secrets.mandrill.user,
+          pass: secrets.mandrill.password
+        }
+      });
+      var mailOptions = {
+        to: user.email,
+        from: 'Team@freecodecamp.com',
+        subject: 'Reset your Free Code Camp password',
+        text: [
+          'You are receiving this email because you (or someone else)\n',
+          'requested we reset your Free Code Camp account\'s password.\n\n',
+          'Please click on the following link, or paste this into your\n',
+          'browser to complete the process:\n\n',
+          'http://',
+          req.headers.host,
+          '/reset/',
+          token,
+          '\n\n',
+          'If you did not request this, please ignore this email and\n',
+          'your password will remain unchanged.\n'
+        ].join('')
+      };
+      transporter.sendMail(mailOptions, function(err) {
+        if (err) { return done(err); }
+        req.flash('info', {
+          msg: 'An e-mail has been sent to ' +
+          user.email +
+          ' with further instructions.'
+        });
+        done(null, 'done');
+      });
+    }
+  ], function(err) {
+    if (err) { return next(err); }
+    res.redirect('/forgot');
+  });
 };
diff --git a/views/account/show.jade b/views/account/show.jade
index cd880b7dfe..bd1d21b93b 100644
--- a/views/account/show.jade
+++ b/views/account/show.jade
@@ -41,7 +41,7 @@ block content
                         .col-xs-12.col-sm-12.col-md-3.text-center
                             .background-svg.img-center
                                 .points-on-top
-                                    = "[ " + progressTimestamps.length + " ]"
+                                    = "[ " + points + " ]"
 
 
                 .row
@@ -95,14 +95,17 @@ block content
                                 a.btn.btn-lg.btn-block.btn-info(href=website3Link, target='_blank')
                                     i.fa.icon-beaker
                                     | Try it out
-
-                    html.
-                        <script type="text/javascript" src="//d3js.org/d3.v3.min.js"></script>
-                        <script type="text/javascript" src="//cdn.jsdelivr.net/cal-heatmap/3.3.10/cal-heatmap.min.js"></script>
-                        <link rel="stylesheet" href="//cdn.jsdelivr.net/cal-heatmap/3.3.10/cal-heatmap.css" />
+                    //
+                        html.
+                            <script type="text/javascript" src="//d3js.org/d3.v3.min.js"></script>
+                            <script type="text/javascript" src="//cdn.jsdelivr.net/cal-heatmap/3.3.10/cal-heatmap.min.js"></script>
+                            <link rel="stylesheet" href="//cdn.jsdelivr.net/cal-heatmap/3.3.10/cal-heatmap.css" />
 
                     .col-xs-12
                         #cal-heatmap
+                            script(src="//d3js.org/d3.v3.min.js")
+                            script(src="//cdn.jsdelivr.net/cal-heatmap/3.3.10/cal-heatmap.min.js")
+                            link(rel="stylesheet", href="//cdn.jsdelivr.net/cal-heatmap/3.3.10/cal-heatmap.css")
                             script.
                                 var cal = new CalHeatMap();
                                 var calendar = !{JSON.stringify(calender)};
diff --git a/views/partials/bonfires.jade b/views/partials/bonfires.jade
index be321383d2..bfada7da53 100644
--- a/views/partials/bonfires.jade
+++ b/views/partials/bonfires.jade
@@ -21,5 +21,5 @@ h3
 
                 }
         });
-    
+