diff --git a/static/directives/billing-options.html b/static/directives/billing-options.html
index 47b1d9c28..aa9089f03 100644
--- a/static/directives/billing-options.html
+++ b/static/directives/billing-options.html
@@ -1,11 +1,11 @@
 <div class="billing-options-element">
   <!-- Credit Card -->
-  <div class="panel">
+  <div style="margin-bottom: 20px">
     <div class="panel-title">
       Credit Card
     </div>
     <div class="panel-body">
-      <div class="quay-spinner" ng-show="!currentCard || changingCard"></div>
+      <div class="cor-loader-inline" ng-show="!currentCard || changingCard"></div>
       <div class="current-card" ng-show="currentCard && !changingCard">
         <div class="alert alert-warning" ng-if="currentCard.last4 && isExpiringSoon(currentCard)">
           Your current credit card is expiring soon!
@@ -29,10 +29,10 @@
   </div>
 
   <!-- Options -->
-  <div class="panel">
+  <div style="margin-bottom: 20px">
     <div class="panel-title">
       Billing Options
-      <div class="quay-spinner" ng-show="working"></div>
+      <div class="cor-loader-inline" ng-show="working"></div>
     </div>
     <div class="panel-body">
       <div class="settings-option">
diff --git a/static/js/directives/ui/plan-manager.js b/static/js/directives/ui/plan-manager.js
index 72816b134..ad6b73851 100644
--- a/static/js/directives/ui/plan-manager.js
+++ b/static/js/directives/ui/plan-manager.js
@@ -11,6 +11,9 @@ angular.module('quay').directive('planManager', function () {
     scope: {
       'user': '=user',
       'organization': '=organization',
+
+      'hasSubscription': '=hasSubscription',
+
       'readyForPlan': '&readyForPlan',
       'planChanged': '&planChanged'
     },
@@ -68,6 +71,7 @@ angular.module('quay').directive('planManager', function () {
 
           $scope.planChanging = false;
           $scope.planLoading = false;
+          $scope.hasSubscription = subscribedPlan.stripeId != PlanService.getFreePlan();
         });
       };
 
diff --git a/static/partials/org-view.html b/static/partials/org-view.html
index 5bca6aabb..3565a94e5 100644
--- a/static/partials/org-view.html
+++ b/static/partials/org-view.html
@@ -110,7 +110,10 @@
         <div id="usage" class="tab-pane" quay-require="['BILLING']">
           <h3>Plan Usage and Billing</h3>
           <div ng-if="isAdmin">
-            <div class="plan-manager" organization="organization.name"></div>
+            <div class="plan-manager" organization="organization.name"
+                 has-subscription="hasSubscription"></div>
+            <hr ng-show="hasSubscription">
+            <div class="billing-options" organization="organization" ng-show="hasSubscription"></div>
           </div>
         </div>
 
diff --git a/static/partials/user-view.html b/static/partials/user-view.html
index 29b4e9d9b..d1ae6ac8a 100644
--- a/static/partials/user-view.html
+++ b/static/partials/user-view.html
@@ -82,7 +82,9 @@
         <!-- Plan and Usage -->
         <div id="usage" class="tab-pane" quay-require="['BILLING']">
           <h3>Plan Usage and Billing</h3>
-          <div class="plan-manager" user="viewuser"></div>
+          <div class="plan-manager" user="viewuser" has-subscription="hasSubscription"></div>
+          <hr ng-show="hasSubscription">
+          <div class="billing-options" user="viewuser" ng-show="hasSubscription"></div>
         </div>
 
         <!-- Billing Invoices -->