diff --git a/view/template/download/get.php b/view/template/download/get.php
index 5293560c..97ccc0c7 100644
--- a/view/template/download/get.php
+++ b/view/template/download/get.php
@@ -21,7 +21,6 @@
   </div>
   <div class="span5">
     <?php echo View::render('download/_social') ?>
-    <?php echo View::render('download/_social') ?>
   </div>
 </main>
 
diff --git a/view/template/analytics/track.php b/view/template/layout/_analytics.php
similarity index 88%
rename from view/template/analytics/track.php
rename to view/template/layout/_analytics.php
index 58873d74..6eb0e4e0 100644
--- a/view/template/analytics/track.php
+++ b/view/template/layout/_analytics.php
@@ -10,7 +10,7 @@
     ga('send', 'pageview');
 
     <?php //we load fb sdk elsewhere, events loaded below (do we need both??) ?>
-      
+
     !function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?
     n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;
     n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;
@@ -22,4 +22,8 @@
     <?php //and now everyone knows what happens on our website except us ?>
 
   </script>
+<?php else: ?>
+  <?php js_start() ?>
+    console.log('Analytics partial skipped because this is a non-production instance.');
+  <?php js_end() ?>
 <?php endif ?>
\ No newline at end of file
diff --git a/view/template/layout/basic.php b/view/template/layout/basic.php
index eee0a23a..0bb5925b 100644
--- a/view/template/layout/basic.php
+++ b/view/template/layout/basic.php
@@ -62,7 +62,7 @@
           <?php foreach(Response::getJsAssets() as $src): ?>
             <script src="<?php echo $src ?>"></script>
           <?php endforeach ?>
-          <?php echo View::render('analytics/track') ?>
+          <?php echo View::render('layout/_analytics') ?>
           <?php $js = Response::getJsCalls() ?>
           <?php if ($js): ?>
             <script><?php echo implode("\n", $js) ?></script>