diff --git a/js/controllers.js b/js/controllers.js
index de912c8..a7ef1d2 100644
--- a/js/controllers.js
+++ b/js/controllers.js
@@ -49,61 +49,56 @@ function FeedCtrl($scope, $routeParams, $location, feeds, pageSwitcher, feedItem
         }
     };
 
-    $scope.showItemOptions = function(id) {
-        angular.forEach($scope.feed.items, function(value, key) {
-            if (value.id == id) {
-                $scope.feed.items[key].showOptions = !$scope.feed.items[key].showOptions;
-            } else {
-                $scope.feed.items[key].showOptions = false;
+    pageSwitcher.setBack('feeds');
             }
+
+function ListItemCtrl($scope, $rootScope, feedItems, downloader, pageChanger)
+{
+    $scope.playItem = function(id) {
+        feedItems.get(id, function(feedItem) {
+            $rootScope.$broadcast('playItem', feedItem);
         });
     };
 
+    $scope.showItemOptions = function(id) {
+        //TODO: close all other options bars
+        this.item.showOptions = !this.item.showOptions;
+    };
+
     $scope.addToQueue = function(id) {
         feedItems.addToQueue(id);
     };
 
-    $scope.playItem = function(id) {
-        feedItems.get(id, function(feedItem) {
-            $rootScope.$broadcast('playItem', feedItem);
-        });
-    };
-
-    pageSwitcher.setBack('feeds');
-}
-
-function QueueListCtrl($scope, $rootScope, pageSwitcher, feedItems, feeds, downloader, queueList, pageChanger) {
-    $scope.queue = queueList.getQueueList();
-
-    $scope.$on('queueListRefresh', function(event) {
-        $rootScope.$apply(queueList.rebuildList());
-    });
-
-    $scope.playItem = function(id) {
-        feedItems.get(id, function(feedItem) {
-            $rootScope.$broadcast('playItem', feedItem);
-        });
-    };
-
-    $scope.showItemOptions = function(id) {
-        angular.forEach($scope.queue, function(value, key) {
-            if (value.id == id) {
-                $scope.queue[key].showOptions = !$scope.queue[key].showOptions;
-            } else {
-                $scope.queue[key].showOptions = false;
-            }
-        });
-    };
-
     $scope.downloadFile = function(id) {
         feedItems.get(id, function(feedItem) {
             downloader.downloadFiles([feedItem]);
         });
     };
 
+
+    $scope.reDownloadFile = function(id) {
+        feedItems.get(id, function(feedItem) {
+            feedItem.audio = null;
+            downloader.downloadFiles([feedItem]);
+        });
+    };
+
+    $scope.goToFeed = function(feedId) {
+        pageChanger.goToFeed(feedId);
+    };
+
     $scope.removeFromQueue = function(feedItemId) {
         feedItems.unQueue(feedItemId);
     };
+}
+
+function QueueListCtrl($scope, $rootScope, pageSwitcher, feedItems, feeds, downloader, queueList, pageChanger) {
+    $scope.queue = queueList.getQueueList();
+
+    $scope.$on('queueListRefresh', function(event) {
+        console.log('rebuilding');
+        $rootScope.$apply(queueList.rebuildList());
+    });
 
     $scope.downloadItems = function(updateStatus) {
         feeds.downloadAllItems(feedItems, function(feedItem, feed) {
@@ -116,18 +111,6 @@ function QueueListCtrl($scope, $rootScope, pageSwitcher, feedItems, feeds, downl
         });
     };
 
-    $scope.reDownloadFile = function(id) {
-        feedItems.get(id, function(feedItem) {
-            feedItem.audio = null;
-            downloader.downloadFiles([feedItem]);
-        });
-    };
-
-    //TODO: extract this to somewhere
-    $scope.goToFeed = function(feedId) {
-        pageChanger.goToFeed(feedId);
-    };
-
     pageSwitcher.change('queue');
 }
 
diff --git a/partials/feed.html b/partials/feed.html
index 9a0bec1..5f67f7a 100644
--- a/partials/feed.html
+++ b/partials/feed.html
@@ -14,18 +14,22 @@
             {{ feed.summary }}
         </div>
         <h3>Episodes</h3>
-        <div ng-repeat="item in feed.items | orderBy:'date':reverse=true">
+        <div ng-repeat="item in feed.items | orderBy:'date':reverse=true" ng-controller="ListItemCtrl">
             <div class="listItem">
                 <div class="playButton">
                     <span ng-click="playItem(item.id)"><i ng-class="{hasAudio: item.audio}" class="icon-play"></i></span>
                 </div>
                 <div class="feedItemContent" ng-click="showItemOptions(item.id)">
                     <span class="feedItemTitle">{{ item.title }}</span>
-                    {{ item.date | timeAgo }}
+                    {{ item.date | timeAgo }}<span ng-show="item.duration">, {{ item.duration }}</span>
                 </div>
             </div>
             <div ng-show="item.showOptions" class="feedItemOptions">
                 <a ng-hide="item.queued" ng-click="addToQueue(item.id)"><i class="icon-plus"></i> Add to Queue</a>
+                <a ng-hide="item.audio" ng-click="downloadFile(item.id)"><i class="icon-download"></i> Download</a>
+                <a ng-show="item.audio" ng-click="reDownloadFile(item.id)"><i class="icon-download"></i> Re-Download</a>
+                <a ng-click="goToFeed(item.feedId)"><i class="icon-list-ul"></i> Show Feed</a>
+                <a ng-show="item.queued" ng-click="removeFromQueue(item.id)"><i class="icon-remove-circle"></i> Unqueue</a>
             </div>
         </div>
     </div>
diff --git a/partials/listItem.html b/partials/listItem.html
new file mode 100644
index 0000000..f4a9bc7
--- /dev/null
+++ b/partials/listItem.html
@@ -0,0 +1,17 @@
+<!-- This isn't used yet, because of https://github.com/angular/angular.js/issues/3584 -->
+<div class="listItem">
+    <div class="playButton">
+        <span ng-click="playItem(item.id)"><i ng-class="{hasAudio: item.audio}" class="icon-play"></i></span>
+    </div>
+    <div class="feedItemContent" ng-click="showItemOptions(item.id)">
+        <span class="feedItemTitle">{{ item.title }}</span>
+        {{ item.date | timeAgo }}<span ng-show="item.duration">, {{ item.duration }}</span>
+    </div>
+</div>
+<div ng-show="item.showOptions" class="feedItemOptions">
+    <a ng-hide="item.queued" ng-click="addToQueue(item.id)"><i class="icon-plus"></i> Add to Queue</a>
+    <a ng-hide="item.audio" ng-click="downloadFile(item.id)"><i class="icon-download"></i> Download</a>
+    <a ng-show="item.audio" ng-click="reDownloadFile(item.id)"><i class="icon-download"></i> Re-Download</a>
+    <a ng-click="goToFeed(item.feedId)"><i class="icon-list-ul"></i> Show Feed</a>
+    <a ng-click="removeFromQueue(item.id)"><i class="icon-remove-circle"></i> Unqueue</a>
+</div>
\ No newline at end of file
diff --git a/partials/listQueue.html b/partials/listQueue.html
index 5dbb36b..9c694b4 100644
--- a/partials/listQueue.html
+++ b/partials/listQueue.html
@@ -1,19 +1,20 @@
 <div id="queueList" pull-to-refresh="pull-to-refresh">
-    <div ng-repeat="feedItem in queue|orderBy:'-date'" class="listRow">
+    <div ng-repeat="item in queue|orderBy:'-date'" class="listRow" ng-controller="ListItemCtrl">
         <div class="listItem">
-            <div class="playButton" ng-click="playItem(feedItem.id)">
-                <span><i ng-class="{hasAudio: feedItem.audio}" class="icon-play"></i></span>
+            <div class="playButton">
+                <span ng-click="playItem(item.id)"><i ng-class="{hasAudio: item.audio}" class="icon-play"></i></span>
             </div>
-            <div class="feedItemContent" ng-click="showItemOptions(feedItem.id)">
-                <span class="feedItemTitle">{{ feedItem.title }}</span>
-                {{ feedItem.date | timeAgo }}<span ng-show="feedItem.duration">, {{ feedItem.duration }}</span>
+            <div class="feedItemContent" ng-click="showItemOptions(item.id)">
+                <span class="feedItemTitle">{{ item.title }}</span>
+                {{ item.date | timeAgo }}<span ng-show="item.duration">, {{ item.duration }}</span>
             </div>
         </div>
-        <div ng-show="feedItem.showOptions" class="feedItemOptions">
-            <a ng-hide="feedItem.audio" ng-click="downloadFile(feedItem.id)"><i class="icon-download"></i> Download</a>
-            <a ng-show="feedItem.audio" ng-click="reDownloadFile(feedItem.id)"><i class="icon-download"></i> Re-Download</a>
-            <a ng-click="goToFeed(feedItem.feedId)"><i class="icon-list-ul"></i> Show Feed</a>
-            <a ng-click="removeFromQueue(feedItem.id)"><i class="icon-remove-circle"></i> Unqueue</a>
+        <div ng-show="item.showOptions" class="feedItemOptions">
+            <a ng-hide="item.queued" ng-click="addToQueue(item.id)"><i class="icon-plus"></i> Add to Queue</a>
+            <a ng-hide="item.audio" ng-click="downloadFile(item.id)"><i class="icon-download"></i> Download</a>
+            <a ng-show="item.audio" ng-click="reDownloadFile(item.id)"><i class="icon-download"></i> Re-Download</a>
+            <a ng-click="goToFeed(item.feedId)"><i class="icon-list-ul"></i> Show Feed</a>
+            <a ng-show="item.queued" ng-click="removeFromQueue(item.id)"><i class="icon-remove-circle"></i> Unqueue</a>
         </div>
     </div>
     <div ng-hide="queue.length" class="pullDownMessage">