diff --git a/public/templates/albums/show.html b/public/templates/albums/show.html
index ad2f7e06..9c5d64f5 100644
--- a/public/templates/albums/show.html
+++ b/public/templates/albums/show.html
@@ -5,7 +5,12 @@
                 Downloads
             </a>
             <ul class="dropdown-menu" ng-show="album.is_downloadable == 1">
-                <li bindonce ng-repeat="format in album.formats"><a target="_blank" bo-href="format.url"><span bo-text="format.name"></span> <small bo-text="'(' + format.size + ')'"></small></a></li>
+                <li bindonce ng-repeat="format in album.formats" ng-hide="isEncoding">
+                    <a target="_blank" ng-if="!format.isCacheable" bo-href="format.url"><span bo-text="format.name"></span> <small bo-text="'(' + format.size + ')'"></small></a>
+                    <a ng-if="format.isCacheable" ng-click="getCachedAlbum(album.id, format.name);" href=""><span bo-text="format.name"></span> <small bo-text="'(' + format.size + ')'"></small></a>
+                </li>
+                <li ng-show="isEncoding" class="cache-loading"><img src="/images/loading.gif" /></li>
+                <li ng-show="isEncoding" class="cache-loading"><small>We&#39;re getting your download ready! This may take up to a few minutes .</small></li>
             </ul>
         </li>
         <li><a href="#" class="btn" pfm-eat-click ng-click="share()">Share</a></li>
diff --git a/public/templates/tracks/show.html b/public/templates/tracks/show.html
index 8fce26d1..e01209aa 100644
--- a/public/templates/tracks/show.html
+++ b/public/templates/tracks/show.html
@@ -5,7 +5,12 @@
                 Downloads
             </a>
             <ul class="dropdown-menu" ng-show="track.is_downloadable == 1">
-                <li bindonce ng-repeat="format in track.formats"><a target="_blank" bo-href="format.url"><span bo-text="format.name"></span> <small bo-text="'(' + format.size + ')'"></small></a></li>
+                <li bindonce ng-repeat="format in track.formats" ng-hide="isEncoding">
+                    <a target="_blank" ng-if="!format.isCacheable" bo-href="format.url"><span bo-text="format.name"></span> <small bo-text="'(' + format.size + ')'"></small></a>
+                    <a ng-if="format.isCacheable" ng-click="getCachedTrack(track.id, format.name);" href=""><span bo-text="format.name"></span> <small bo-text="'(' + format.size + ')'"></small></a>
+                </li>
+                <li ng-show="isEncoding" class="cache-loading"><img src="/images/loading.gif" /></li>
+                <li ng-show="isEncoding" class="cache-loading"><small>We&#39;re getting your download ready! This'll take a few seconds.</small></li>
             </ul>
         </li>
         <li class="dropdown">