diff --git a/static/directives/tour-content.html b/static/directives/tour-content.html
index fb8e37be1..f569f5a82 100644
--- a/static/directives/tour-content.html
+++ b/static/directives/tour-content.html
@@ -70,17 +70,17 @@
     </div>
   </div>
 
-<div class="row testimonial" quay-require="['BILLING']">
-  <div class="tour-action" quay-require="['BILLING']">
-    <a href="/plans?trial-plan=personal">
-      <button class="btn btn-success">
-        Start free trial
-      </button>
-    </a>
+  <div class="row testimonial" quay-require="['BILLING']">
+    <div class="tour-action" quay-require="['BILLING']">
+      <a href="/plans?trial-plan=personal">
+        <button class="btn btn-success">
+          Start free trial
+        </button>
+      </a>
+    </div>
   </div>
 </div>
 
-
 <!-- Organizations -->
 <div class="product-tour" ng-if="kind == 'organizations'">
   <div class="tour-section row tour-header">
diff --git a/static/js/directives/ui/plan-manager.js b/static/js/directives/ui/plan-manager.js
index c6414378e..f0061a122 100644
--- a/static/js/directives/ui/plan-manager.js
+++ b/static/js/directives/ui/plan-manager.js
@@ -37,7 +37,7 @@ angular.module('quay').directive('planManager', function () {
             return !$scope.isPlanVisible(superseded, subscribedPlan);
           }
 
-          return plan.stripeId === subscribedPlan.stripeId;
+          return subscribedPlan && plan.stripeId === subscribedPlan.stripeId;
         }
 
         return true;
diff --git a/static/js/pages/org-view.js b/static/js/pages/org-view.js
index a8aac0b9a..15867e109 100644
--- a/static/js/pages/org-view.js
+++ b/static/js/pages/org-view.js
@@ -31,6 +31,7 @@
     var loadRepositories = function() {
       var options = {
         'namespace': orgname,
+        'public': true
       };
 
       $scope.repositoriesResource = ApiService.listReposAsResource().withOptions(options).get(function(resp) {