diff --git a/client/app/projectchooser/projectchooser.less b/client/app/projectchooser/projectchooser.less
index 459ae5e6..e532ea5f 100644
--- a/client/app/projectchooser/projectchooser.less
+++ b/client/app/projectchooser/projectchooser.less
@@ -11,5 +11,15 @@
   height: auto;
   width: auto;
   max-height: 100%;
-  max-width: 100%
+  max-width: 100%;
+  background-color: #eee;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+
+  button {
+    margin-bottom: 10px;
+  }
+
+
 }
diff --git a/client/app/projects/profile/profile.controller.js b/client/app/projects/profile/profile.controller.js
index 54f4ebe4..fab19fb6 100644
--- a/client/app/projects/profile/profile.controller.js
+++ b/client/app/projects/profile/profile.controller.js
@@ -24,6 +24,9 @@ angular.module('observatory3App')
     };
     updateProject();
 
+    $scope.selectImage = function() {
+      angular.element('#uploadImage').trigger('click');
+    };
     $scope.editProject = function() {
       $scope.editedProject = angular.copy($scope.project);
 
@@ -66,25 +69,37 @@ angular.module('observatory3App')
     $scope.getPic = function(user) {
         if (! ('avatar' in user)){
             user.avatar = "//www.gravatar.com/avatar/00000000000000000000000000000000?d=monsterid";
-            $http.get('/api/users/' + user._id + '/avatar')            .success(function(avatar){
+            $http.get('/api/users/' + user._id + '/avatar').success(function(avatar){
                 user.avatar = avatar;
-            })
+            });
+        } else {
         }
         return user.avatar
     }
 
     var initializeSlides = function(photos) {
         var slides = [];
-        for (var i = 0; i < photos.length; i++){
-            slides.push({
-                id: i,
-                active: false,
-                image: $scope.imgPrefix + photos[i],
-                src: photos[i]
-            });
-            if (i === 0) {
-                slides[0].active = true;
-            }
+        if(photos.length > 0) {
+          for (var i = 0; i < photos.length; i++){
+              slides.push({
+                  id: i,
+                  active: false,
+                  image: $scope.imgPrefix + photos[i],
+                  src: photos[i]
+              });
+              if (i === 0) {
+                  slides[0].active = true;
+              }
+          }
+        }
+        else {
+          slides.push({
+            id: 0,
+            active: true,
+            placeholder: true,
+            image: '../../assets/images/projectplaceholder.png',
+            src: '../../assets/images/projectplaceholder.png'
+          });
         }
         $scope.slides = slides;
     }
@@ -99,7 +114,7 @@ angular.module('observatory3App')
 
     $scope.isLoggedIn = Auth.isLoggedIn;
     $scope.isAdmin = Auth.isAdmin;
-
+    $scope.isMentor = Auth.isMentor;
 
     $scope.joinProject = function(){
         $http.put('/api/users/' + $scope.user._id + '/project',{
@@ -212,18 +227,4 @@ angular.module('observatory3App')
       };
 
 //end tech bubble code
-
-
-})
-.directive('desc', function() {
-    return {
-        restrict:'E',
-        template: '<div btf-markdown=\'project.description\'></div> \
-        <textarea ng-show=\'edittingDesc && userOnProject\' ng-model=\'project.description\' ></textarea>'
-    };
-}).directive('pname', function() {
-    return {
-        restrict:'E',
-        template: '<input type=\'text\' maxlength="50" ng-show=\'edittingName && userOnProject\' ng-model=\'project.name\'><br>'
-    };
-})
+});
diff --git a/client/app/projects/profile/profile.html b/client/app/projects/profile/profile.html
index 48347644..c201904c 100644
--- a/client/app/projects/profile/profile.html
+++ b/client/app/projects/profile/profile.html
@@ -1,104 +1,94 @@
 <div ng-include="'components/navbar/navbar.html'"></div>
 
-<div class="container">
-    <div class="row text-left">
-        <div class="col-sm-3">
-            <h1 ng-hide="edittingName">{{project.name}}</h1>
-            <p>
-                <pname></pname>
-            </p>
-        </div>
-        <div class="col-sm-9 text-right header-buttons">
-            <a class="btn btn-info" href="{{project.websiteUrl}}" title="">Website</a>
-            <a class="btn btn-info" href="{{project.repositories[0]}}" title="" ng-show="project.repositories.length == 1">Repository <span class="glyphicon glyphicon-menu-right"></span></a>
-            <div class="btn-group" uib-dropdown is-open="repositoryMenu"  ng-show="project.repositories.length > 1">
-                <a class="btn btn-info dropdown-toggle" uib-dropdown-toggle role="button" aria-haspopup="true" aria-expanded="false">
-                    Repositories <span class="caret"></span>
-                </a>
-                <ul class="dropdown-menu" uib-dropdown-menu>
-                    <li><a href="{{repo}}" ng-repeat="repo in project.repositories">{{repo}} <span class="glyphicon glyphicon-menu-right"></span></a></li>
-                </ul>
-            </div>
-            <a class="btn btn-info" href="/projects/{{project.githubUsername}}/{{project.githubProjectName}}/blog" title="">Blog</a>
-
-        </div>
-        <div class="col-sm-9 text-right header-buttons">
-            <button type="button" ng-show='isLoggedIn() && !userOnProject' class="btn btn-success" ng-click='joinProject()'>Join Project</button>
-            <button type="button" ng-show='isLoggedIn() && userOnProject' class="btn btn-danger" ng-click='leaveProject()'>Leave Project</button>
-            <button type="button" ng-show='isAdmin() && project.markedDefault' class="btn btn-success" ng-click='unmarkDefault()'>Unmark Default</button>
-            <button type="button" ng-show='isAdmin() && !project.markedDefault' class="btn btn-success" ng-click='markDefault()'>Mark Default</button>
-            <button type="button" ng-show='isLoggedIn() && userOnProject && project.active' class="btn btn-warning" ng-click='markPast()'>Mark Past Project </button>
-            <button type="button" ng-show='isLoggedIn() && userOnProject && !project.active' class="btn btn-warning" ng-click='markActive()'>Mark Active Project </button>
-            <button type="button" class="btn btn-primary" ng-click="editProject()" ng-show="userOnProject">
-              Edit Project
-            </button>
+<div class="container project-profile">
+  <div class="row text-left">
+    <div class="col-sm-3">
+      <h1 ng-hide="edittingName">{{project.name}}</h1>
+    </div>
+    <div class="col-sm-9 text-right header-buttons">
+      <a class="btn btn-info" href="{{project.websiteUrl}}" title="" target="_blank">Website</a>
+      <a class="btn btn-info" href="{{project.repositories[0]}}" title="" ng-show="project.repositories.length === 1" target="_blank">Repository <span class="glyphicon glyphicon-menu-right"></span></a>
+      <div class="btn-group" uib-dropdown is-open="repositoryMenu" ng-show="project.repositories.length > 1">
+        <a class="btn btn-info dropdown-toggle" uib-dropdown-toggle role="button" aria-haspopup="true" aria-expanded="false">
+          Repositories <span class="caret"></span>
+        </a>
+        <ul class="dropdown-menu" uib-dropdown-menu>
+          <li><a href="{{repo}}" ng-repeat="repo in project.repositories">{{repo}}<span class="glyphicon glyphicon-menu-right"></span></a></li>
+        </ul>
+      </div>
+      <a class="btn btn-info" href="/projects/{{project.githubUsername}}/{{project.githubProjectName}}/blog" title="">Blog</a>
+    </div>
+    <div class="col-sm-9 text-right header-buttons">
+      <button type="button" ng-show='isLoggedIn() && !userOnProject' class="btn btn-success" ng-click='joinProject()'>Join Project</button>
+      <button type="button" ng-show='isLoggedIn() && userOnProject' class="btn btn-danger" ng-click='leaveProject()'>Leave Project</button>
+      <button type="button" ng-show='isAdmin() && project.markedDefault' class="btn btn-success" ng-click='unmarkDefault()'>Unmark Default</button>
+      <button type="button" ng-show='isAdmin() && !project.markedDefault' class="btn btn-success" ng-click='markDefault()'>Mark Default</button>
+      <button type="button" ng-show="isMentor() && userOnProject && project.active" class="btn btn-warning" ng-click="markPast()">Mark Past Project</button>
+      <button type="button" ng-show="isMentor() && userOnProject && !project.active" class="btn btn-warning ng-hide" ng-click="markActive()">Mark Active Project</button>
+      <button type="button" class="btn btn-primary" ng-click="editProject()" ng-show="userOnProject">Edit Project</button>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-sm-12">
+      <div class="tech-tags">
+        <div class="tech-boxes">
+          <span ng-repeat="tech in project.tech track by $index">
+            {{tech}}
+            <g class="glyphicon glyphicon-remove" ng-show='isLoggedIn() && userOnProject' class='btn btn=default btn-xs' ng-click='removeTech(tech)' aria-hidden="true"></g>
+          </span>
+          <input ng-show='isLoggedIn() && userOnProject' ng-enter="addTechBubble()" ng-model="insertTechContent" size='4' type='text' />
+          <button ng-show='isLoggedIn() && userOnProject' ng-click="addTechBubble()" class="btn btn-default btn-xs">+</button>
         </div>
-
+      </div>
     </div>
-    <div class="row">
-        <div class="col-sm-7 project-image">
-
-            <div class="fileUpload btn btn-sm btn-default" ng-show="userOnProject">
-                <span>Upload Images</span>
-                <div id="upload">
-                    <input type="file" ngf-select="upload($file)" />
-                </div>
-            </div>
-            <div class="remove-photo btn btn-sm btn-default text-right" ng-show="userOnProject && project && slides.length" ng-click="deletePhoto()">
-                <span>X</span>
-            </div>
-
-            <p ng-show="project.photos.length === 0">
-                No images uploaded yet.
-            </p>
+  </div>
+  <div class="row">
+    <div class="row-height">
+      <div class="col-xs-12 col-sm-7 col-sm-height col-sm-top">
+        <div class="project-image inside">
+          <uib-carousel active="active" no-wrap="true">
+            <uib-slide ng-repeat="slide in slides track by slide.id" index="slide.id" active="slide.active">
+              <img ng-src="{{ slide.image }}" index="slide.id" style="margin:auto;">
+            </uib-slide>
+          </uib-carousel>
 
-            <uib-carousel active="active" no-wrap="true">
-                <uib-slide ng-repeat="slide in slides track by slide.id" index="slide.id" active="slide.active">
-                  <img ng-src="{{ slide.image }}" index="slide.id" style="margin:auto;">
-                </uib-slide>
-            </uib-carousel>
+          <button class="btn btn-sm btn-default" ng-click="selectImage()" ng-show="userOnProject">Upload Images</button>
+          <input id="uploadImage" type="file" ngf-select="upload($file)" />
+          <g class="glyphicon glyphicon-remove remove-photo btn btn-default" ng-show="userOnProject && project && !slides[0].placeholder" ng-click="deletePhoto()"></g>
         </div>
-
-        <div class="col-sm-4">
-            <div class="contributors">
-                <div class="row">
-                    <h4>Contributors</h4>
-                </div>
-                <div class="row" ng-repeat="user in authors">
-                    <div class="col-md-3">
-                        <img ng-src="{{getPic(user)}}&s=128px" class="img-responsive" alt="">
-
-                    </div>
-                    <div class="col-md-8">
-                        <a href="/users/{{ user._id }}/profile" title="" class="contributor-name">
-                            {{ user.name }}
-                        </a>
-                    </div>
-                </div>
-            </div>
+      </div>
+      <div class="col-xs-12 col-sm-5 col-sm-height col-sm-top">
+        <div class="description inside-full-height">
+          <h3>About</h3>
+          <div class="description-text" btf-markdown="project.description"></div>
         </div>
+      </div>
     </div>
-    <div class="row">
-        <br>
-    </div>
-    <div class="row">
-        <div class="col-sm-7 description">
-            <desc></desc>
-        </div>
-        <div class="col-sm-4">
-            <div class="tech-tags">
-                <h4>Tech Tags</h4>
-                <div class='tech-boxes'>
-                    <div ng-repeat="tech in project.tech track by $index">
-                        {{tech}}
-                        <button ng-show='isLoggedIn() && userOnProject' class='btn btn=default btn-xs' ng-click='removeTech(tech)'>x</button>
-                    </div>
-                    <input ng-show='isLoggedIn() && userOnProject' ng-enter="addTechBubble()" ng-model="insertTechContent" size='4' type='text' />
-                    <button ng-show='isLoggedIn() && userOnProject' ng-click="addTechBubble()" class="btn btn-default btn-xs">+</button>
-                </div>
+  </div>
+  <div class="row">
+    <div class="col-sm-12">
+      <div class="contributors">
+        <div class="container-fluid">
+          <div class="row">
+            <h3>Contributors</h3>
+          </div>
+          <div class="row image-row">
+            <div ng-repeat="user in authors | orderBy: '+name'">
+              <div class="col-xs-4 col-sm-2 col-md-2 text-center user-box">
+                  <a href="/users/{{ user._id}}/profile" class="user-avatar">
+                      <img class="profile-img img-responsive img-circle placeholder-img" ng-src='{{user.avatar}}&s=248px'>
+                  </a>
+                  <p class="user-name">
+                  <a href="/users/{{ user._id}}/profile">{{ user.name }}</a>
+                  </p>
+
+              </div>
             </div>
+          </div>
         </div>
+      </div>
     </div>
   </div>
 </div>
+
 <div ng-include="'components/footer/footer.html'"></div>
diff --git a/client/app/projects/profile/profile.less b/client/app/projects/profile/profile.less
index 3e0b8d70..2be884e9 100644
--- a/client/app/projects/profile/profile.less
+++ b/client/app/projects/profile/profile.less
@@ -1,159 +1,222 @@
-.project-image{
-    background-color: #eee;
-    clear: both;
-    padding: 20px;
-    margin-top: 20px;
-    margin-bottom: 20px;
-    position: relative;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-}
-
-.contributors{
-    background-color: #eee;
-    margin-top: 20px;
-    padding: 0 20px 20px 40px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-}
-
-.description{
-    background-color: #eee;
-    padding: 20px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-}
-
-.contributor-name{
-    margin-top: 20px;
-}
-
-.header-buttons{
-    padding-top: 20px;
-}
-
-.carousel-indicators li {
-    border: 1px solid #444;
-}
-
-.carousel-indicators {
-    bottom: -45px;
-}
-
-.carousel-control {
-    background-image: none !important; /* remove background gradients on controls */
-}
-
-.carousel-indicators .active {
-    background-color: #444;
-}
-
-.project-image {
-    padding-bottom: 50px;
-}
-
-.slide {
-    height: 350px;
-    margin: 0 auto;
-    background-size: contain !important;
-    background-repeat: no-repeat !important;
-}
-
-//change carousel transition to fade instead of slide
-.carousel {
-    .carousel-inner {
-        .item {
-            opacity: 0;
-            -webkit-transition-property: opacity;
-            -moz-transition-property: opacity;
-            -o-transition-property: opacity;
-            transition-property: opacity;
-            -webkit-transition-duration: 300ms;
-            -moz-transition-duration: 300ms;
-            -o-transition-duration: 300ms;
-            transition-duration: 300ms;
-        }
-
-        .active {
-            opacity: 1;
-        }
-
-        .active.left,
-        .active.right {
-            left: 0;
-            opacity: 0;
-            z-index: 1;
-        }
-
-        .next.left,
-        .prev.right {
-            opacity: 1;
-        }
-    }
-
-    .carousel-control {
-        z-index: 2;
+.project-profile{
+  // h3 {
+  //   margin-top: 0px;
+  // }
+
+  div[class*="col"] {
+    padding: 10px;
+  }
+
+  .row-eq-height {
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: -ms-flexbox;
+    display: flex;
+  }
+
+  figure {
+    text-align: center;
+    img {
+      margin: 0px auto;
     }
-}
-
-// hide the file upload input
-#upload {
-    position: absolute;
-    top: 0;
-    right: 0;
-    margin: 0;
-    padding: 0;
-    font-size: 20px;
+  }
+
+  .project-image{
+      background-color: #eee;
+      -webkit-border-radius: 5px;
+      -moz-border-radius: 5px;
+      border-radius: 5px;
+      margin-bottom: 15px;
+  }
+
+  .contributors{
+      padding: 20px;
+      background-color: #eee;
+      -webkit-border-radius: 5px;
+      -moz-border-radius: 5px;
+      border-radius: 5px;
+  }
+
+  .description{
+      // position: absolute;
+      padding-top: 0;
+      padding-left: 15px;
+      padding-right: 15px;
+      padding-bottom: 15px;
+      text-align: justify;
+      overflow-y: auto;
+      word-wrap: break-word;
+      background-color: #eee;
+      -webkit-border-radius: 5px;
+      -moz-border-radius: 5px;
+      border-radius: 5px;
+  }
+
+  .contributor-name{
+      margin-top: 20px;
+  }
+
+  .header-buttons{
+      padding-top: 20px;
+  }
+
+  .carousel-indicators li {
+      border: 1px solid #444;
+  }
+
+  .carousel-indicators {
+      bottom: -45px;
+  }
+
+  .carousel-control {
+      background-image: none !important; /* remove background gradients on controls */
+  }
+
+  .carousel-indicators .active {
+      background-color: #444;
+  }
+
+  .project-image {
+    padding: 2%;
+  }
+
+  .slide {
+      height: 350px;
+      margin: 0 auto;
+      background-size: contain !important;
+      background-repeat: no-repeat !important;
+  }
+
+  //change carousel transition to fade instead of slide
+  .carousel {
+      margin-bottom: 10px;
+      .carousel-inner {
+          .item {
+              opacity: 0;
+              -webkit-transition-property: opacity;
+              -moz-transition-property: opacity;
+              -o-transition-property: opacity;
+              transition-property: opacity;
+              -webkit-transition-duration: 300ms;
+              -moz-transition-duration: 300ms;
+              -o-transition-duration: 300ms;
+              transition-duration: 300ms;
+          }
+
+          .active {
+              opacity: 1;
+          }
+
+          .active.left,
+          .active.right {
+              left: 0;
+              opacity: 0;
+              z-index: 1;
+          }
+
+          .next.left,
+          .prev.right {
+              opacity: 1;
+          }
+      }
+
+      .carousel-control {
+          z-index: 2;
+      }
+  }
+
+  .remove-photo {
+      float: right;
+      position: relative;
+      overflow: hidden;
+      padding: 5px;
+  }
+
+  .glyphicon-remove {
     cursor: pointer;
-    opacity: 0;
-    filter: alpha(opacity=0);
-}
-
-.fileUpload {
-    position: relative;
-    overflow: hidden;
-    margin-top: -10px;
-    margin-bottom: 5px;
-    margin-left: -10px;
-}
-
-.remove-photo {
-    float: right;
-    position: relative;
-    overflow: hidden;
-    margin-top: -10px;
-    margin-bottom: 5px;
-    margin-left: -10px;
-}
-
-desc textarea{
-    width:100%;
-    height:300px;
-}
-
-
-
-.description-buttons {
-    margin-top: -10px;
-    margin-bottom: 8px;
-    margin-left: -10px;
-}
-
-#nameDiv {
-    margin-top: 30px
-}
-
-#repos {
+  }
+
+  desc textarea{
+      width:100%;
+      height:300px;
+  }
+
+  .description-buttons {
+      margin-top: -10px;
+      margin-bottom: 8px;
+      margin-left: -10px;
+  }
+
+  #nameDiv {
+      margin-top: 30px
+  }
+
+  #repos {
+      display: block;
+  }
+
+  .tech-tags {
+      padding: 10px 10px 10px 10px;
+
+      span {
+        padding: 10px;
+        display: inline-block;
+        background-color: #eee;
+        margin-right: 5px;
+        -webkit-border-radius: 5px;
+        -moz-border-radius: 5px;
+        border-radius: 10px;
+      }
+  }
+
+  .tech-boxes {
+    white-space: nowrap;
+    overflow-x: auto;
+  }
+
+  g {
+    padding: 3px;
+  }
+
+  input[type="file"] {
+    display: none;
+  }
+
+  .image-row{
+      padding-top: 10px;
+  }
+
+  .profile-img{
+      display: inline;
+  }
+  .user-box{
+      overflow:hidden;
+      word-break: normal;
+      -webkit-hyphens: auto;
+      -moz-hyphens: auto;
+      -ms-hyphens: auto;
+      hyphens: auto;
+      margin-bottom: 10px;
+      padding-left:  1%;
+      padding-right: 1%;
+  }
+  .user-name{
+      height: 2em;
+      line-height: 1em;
+      margin-top: 5%;
+  }
+
+  .user-avatar{
+    padding-bottom:100%;
+    height:0;
+    position:relative;
     display: block;
-}
+    line-height: 1.42857143;
+    transition: all 0.2s ease-in-out;
+  }
+
+  p{
+      margin: 0 0 0px;
+  }
 
-.tech-tags {
-    background-color: #eee;
-    padding: 10px 10px 10px 10px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
 }
diff --git a/client/app/projects/projects.html b/client/app/projects/projects.html
index 9e4e65eb..bce91fcd 100644
--- a/client/app/projects/projects.html
+++ b/client/app/projects/projects.html
@@ -4,8 +4,6 @@
   <div class="row">
       <div class="col-xs-12">
         <h3>{{ past ? "Past" : "Active" }} Projects</h3>
-        <br>
-
       </div>
     </div>
     <div class="row">
@@ -40,9 +38,9 @@ <h3>{{ past ? "Past" : "Active" }} Projects</h3>
         <div class="extra-content" >
           <h2 id="{{project.githubUsername}}-{{project.githubProjectName}}" class="project-title"><a href="/projects/{{project.githubUsername}}/{{project.githubProjectName}}/profile">{{ project.name}}</a> </h2>
           <ul class="project-info">
-            <li><a href="{{project.websiteUrl}}">Website</a></li>
+            <li><a href="{{project.websiteUrl}}" target="_blank">Website</a></li>
             <li><a href="/projects/{{project.githubUsername}}/{{project.githubProjectName}}/blog">Blog</a></li>
-            <li><a href="{{project.repositories[0]}}">Repository</a></li>
+            <li><a href="{{project.repositories[0]}}" target="_blank">Repository</a></li>
           </ul>
           <div class="clear"></div>
           <div id="description" btf-markdown="project.description"></div>
diff --git a/client/app/user/user.html b/client/app/user/user.html
index 3b51144e..8e7246e6 100644
--- a/client/app/user/user.html
+++ b/client/app/user/user.html
@@ -48,7 +48,7 @@ <h3>{{ past ? "Past " : "" }}RCOS Developers</h3>
     </div>
     <div class="row image-row">
         <div ng-repeat="user in users | filter:searchString | startFrom:currentPage*pageSize | limitTo:pageSize">
-            <div class="col-lg-1 col-md-2 col-sm-3 col-xs-4 text-center user-box">
+            <div class="col-md-2 col-sm-3 col-xs-4 text-center user-box">
                 <a href="/users/{{ user._id}}/profile" class="user-avatar">
                     <img class="profile-img img-responsive placeholder-img" ng-src='{{user.avatar}}&s=248px'>
                 </a>
diff --git a/client/assets/images/projectplaceholder.png b/client/assets/images/projectplaceholder.png
new file mode 100644
index 00000000..950c8cc0
Binary files /dev/null and b/client/assets/images/projectplaceholder.png differ