diff --git a/app/templates/marketplace/payments-layout.hbs b/app/templates/marketplace/payments-layout.hbs
index d15fbf192..032c0699a 100644
--- a/app/templates/marketplace/payments-layout.hbs
+++ b/app/templates/marketplace/payments-layout.hbs
@@ -23,13 +23,15 @@
 	</div>
 {{/view}}
 
-<nav class="payments-navbar clearfix">
-	<div class="actions pull-right">
-		<a {{action "openModal" "modals/export-csv-modal" resultsLoader}} class="btn-link sm">
-			<i class="icon icon-export"></i>
-			Export
-		</a>
-	</div>
-</nav>
+{{#if resultsLoader.results}}
+	<nav class="payments-navbar clearfix">
+		<div class="actions pull-right">
+			<a {{action "openModal" "modals/export-csv-modal" resultsLoader}} class="btn-link sm">
+				<i class="icon icon-export"></i>
+				Export
+			</a>
+		</div>
+	</nav>
+{{/if}}
 
 {{yield}}
diff --git a/app/views/marketplace/orders.js b/app/views/marketplace/orders.js
index 34e3124b6..6c28d4b48 100644
--- a/app/views/marketplace/orders.js
+++ b/app/views/marketplace/orders.js
@@ -1,7 +1,6 @@
 var MarketplaceOrdersView = Ember.View.extend({
 	layoutName: "marketplace/payments-layout",
 	templateName: "marketplace/orders",
-	hasResults: Ember.computed.gt("controller.resultsLoader.results.length", 0),
 });
 
 export default MarketplaceOrdersView;
diff --git a/package.json b/package.json
index ccf101003..6d1b99fa8 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   "repository": "git@github.com:balanced/balanced-dashboard.git",
   "author": "Balanced <dev@balancedpayments.com>",
   "devDependencies": {
-    "balanced-addon-models": "git://github.com/balanced/balanced-addon-models#gandalf",
+    "balanced-addon-models": "git://github.com/balanced/balanced-addon-models",
     "body-parser": "1.2.0",
     "bower": "1.3.12",
     "broccoli-asset-rev": "0.3.1",