diff --git a/static/css/quay.css b/static/css/quay.css
index f9dbb870f..46c972cdd 100644
--- a/static/css/quay.css
+++ b/static/css/quay.css
@@ -670,13 +670,6 @@ i.toggle-icon:hover {
   margin-top: 5px;
 }
 
-.plans-list .plan.small {
-  border: 1px solid #ddd;
-  border-top: 4px solid #428bca;
-  margin-top: 0px;
-  font-size: 1.6em;
-}
-
 .plans-list .plan.business-plan {
   border: 1px solid #eee;
   border-top: 4px solid #94F794;
diff --git a/static/js/controllers.js b/static/js/controllers.js
index 321d8cf9c..108b00ac0 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -33,19 +33,10 @@ function PlansCtrl($scope, $location, UserService, PlanService) {
   };
     
   $scope.buyNow = function(plan) {
+    PlanService.notePlan(plan);
     if ($scope.user && !$scope.user.anonymous) {
-      document.location = '/user?plan=' + plan;
+      PlanService.handleNotedPlan();    
     } else {
-      PlanService.notePlan(plan);
-      $('#signinModal').modal({});
-    }
-  };
-
-  $scope.createOrg = function(plan) {
-    if ($scope.user && !$scope.user.anonymous) {
-      document.location = '/organizations/new/?plan=' + plan;
-    } else {
-      PlanService.notePlan(plan);
       $('#signinModal').modal({});
     }
   };
diff --git a/static/partials/plans.html b/static/partials/plans.html
index 4b8e5a70e..ab90bd927 100644
--- a/static/partials/plans.html
+++ b/static/partials/plans.html
@@ -4,41 +4,22 @@
   </div>
 
   <div class="all-plans">
-    All plans include <span class="feature">unlimited public repositories</span> and <span class="feature">unlimited sharing</span>. All paid plans have a <span class="feature">14-day free trial</span>.
+    All plans include <span class="feature">unlimited public repositories</span> and <span class="feature">unlimited sharing</span>.
+    <br>
+    All business plans include: <span class="business-feature">organizations</span> and <span class="business-feature">teams</span> with <span class="business-feature">delegated access</span> to the organization.
   </div>
 
   <div class="row plans-list">
     <div class="col-xs-0 col-lg-1"></div>
-    <div class="col-lg-2 col-xs-4 plan-container" ng-repeat="plan in plans.user">
-      <div class="plan" ng-class="plan.stripeId">
+    <div class="col-lg-2 col-xs-4 plan-container" ng-repeat="plan in plans" ng-show="plan.price > 0 && !plan.deprecated">
+      <div class="plan" ng-class="plan.stripeId + ' ' + (plan.bus_features ? 'business-plan' : '')">
         <div class="plan-title">{{ plan.title }}</div>
         <div class="plan-price">${{ plan.price/100 }}</div>
         <div class="count"><b>{{ plan.privateRepos }}</b> private repositories</div>
         <div class="description">{{ plan.audience }}</div>
         <div class="smaller">SSL secured connections</div>
-        <button class="btn btn-primary btn-block" ng-click="buyNow(plan.stripeId)">Sign Up Now</button>
-      </div>
-    </div>
-  </div>
-
-  <div class="callout">
-    Business Plan Pricing
-  </div>
-
-  <div class="all-plans">
-    All business plans include all of the personal plan features, plus: <span class="business-feature">organizations</span> and <span class="business-feature">teams</span> with <span class="business-feature">delegated access</span> to the organization. All business plans have a <span class="business-feature">14-day free trial</span>.
-  </div>
-
-  <div class="row plans-list">
-    <div class="col-xs-0 col-lg-1"></div>
-    <div class="col-lg-2 col-xs-4 plan-container" ng-repeat="plan in plans.business">
-      <div class="plan business-plan" ng-class="plan.stripeId">
-        <div class="plan-title">{{ plan.title }}</div>
-        <div class="plan-price">${{ plan.price/100 }}</div>
-        <div class="count"><b>{{ plan.privateRepos }}</b> private repositories</div>
-        <div class="description">{{ plan.audience }}</div>
-        <div class="smaller">SSL secured connections</div>
-        <button class="btn btn-success btn-block" ng-click="createOrg(plan.stripeId)">Sign Up Now</button>
+        <button class="btn btn-block" ng-class="plan.bus_features ? 'btn-success' : 'btn-primary'"
+                ng-click="buyNow(plan.stripeId)">Sign Up Now</button>
       </div>
     </div>
   </div>