diff --git a/scripts/CardListController.js b/scripts/CardListController.js
index 8daeb14..1a60012 100644
--- a/scripts/CardListController.js
+++ b/scripts/CardListController.js
@@ -27,13 +27,14 @@ angular.module('flashy.CardListController', ['ui.router', 'angular.filter']).
 
                     // locally change hidden
                     card.is_hidden = false;
+                    Materialize.toast('Unhidden', 3000, 'rounded');
                 }).
                 error(function(err) {
                     console.log('no unhide for you');
                 });
         };
 
-        // unhide card
+        // hide card
         $scope.hide = function(card) {
             $http.post('/api/flashcards/' + card.id + '/hide/').
                 success(function(data) {
@@ -41,6 +42,7 @@ angular.module('flashy.CardListController', ['ui.router', 'angular.filter']).
 
                     // locally change hidden
                     card.is_hidden = true;
+                    Materialize.toast('Hidden', 3000, 'rounded');
                 }).
                 error(function(err) {
                     console.log('no hide for you');
@@ -55,6 +57,7 @@ angular.module('flashy.CardListController', ['ui.router', 'angular.filter']).
 
                     // locally change boolean for display purposes
                     card.is_in_deck = true;
+                    Materialize.toast('Added to Your Deck', 3000, 'rounded');
                 }).
                 error(function(err) {
                     console.log('no hide for you');
@@ -69,6 +72,7 @@ angular.module('flashy.CardListController', ['ui.router', 'angular.filter']).
 
                     // local change for display purposes
                     card.is_in_deck = false;
+                    Materialize.toast('Removed from Your Deck', 3000, 'rounded');
                 }).
                 error(function(err) {
                     console.log('no hide for you');
@@ -88,6 +92,27 @@ angular.module('flashy.CardListController', ['ui.router', 'angular.filter']).
             $(document).off('keydown');
         });
 
+
+        $scope.dayofweek = function(item) {
+          var date = new Date(item.material_date);
+          switch(date.getDay()) {
+            case 0:
+              return "Su";
+            case 1:
+              return "M";
+            case 2:
+              return "T";
+            case 3:
+              return "W";
+            case 4:
+              return "R";
+            case 5:
+              return "F";
+            case 6:
+              return "Sa";
+          }
+        };
+
         // checkbox filter
         $scope.filter = {
           'week1': true,
@@ -103,17 +128,17 @@ angular.module('flashy.CardListController', ['ui.router', 'angular.filter']).
         };
 
         $scope.filterByDate = function(item) {
-          var date = new Date(item.material_date);
-          return ((date >= new Date('Mar 29, 2015')) && (date <= new Date('Apr 4, 2015')) && $scope.filter['week1']) ||
-                 ((date >= new Date('Apr 4, 2015')) && (date <= new Date('Apr 11, 2015')) && $scope.filter['week2']) ||
-                 ((date >= new Date('Apr 12, 2015')) && (date <= new Date('Apr 18, 2015')) && $scope.filter['week3']) ||
-                 ((date >= new Date('Apr 19, 2015')) && (date <= new Date('Apr 25, 2015')) && $scope.filter['week4']) ||
-                 ((date >= new Date('Apr 26, 2015')) && (date <= new Date('May 2, 2015')) && $scope.filter['week5']) ||
-                 ((date >= new Date('May 3, 2015')) && (date <= new Date('May 9, 2015')) && $scope.filter['week6']) ||
-                 ((date >= new Date('May 10, 2015')) && (date <= new Date('May 16, 2015')) && $scope.filter['week7']) ||
-                 ((date >= new Date('May 17, 2015')) && (date <= new Date('May 23, 2015')) && $scope.filter['week8']) ||
-                 ((date >= new Date('May 24, 2015')) && (date <= new Date('May 30, 2015')) && $scope.filter['week9']) ||
-                 ((date >= new Date('May 31, 2015')) && (date <= new Date('Jun 6, 2015')) && $scope.filter['week10']);
+          var week = item.material_week_num;
+          return (week == 1 && $scope.filter['week1']) ||
+                 (week == 2 && $scope.filter['week2']) ||
+                 (week == 3 && $scope.filter['week3']) ||
+                 (week == 4 && $scope.filter['week4']) ||
+                 (week == 5 && $scope.filter['week5']) ||
+                 (week == 6 && $scope.filter['week6']) ||
+                 (week == 7 && $scope.filter['week7']) ||
+                 (week == 8 && $scope.filter['week8']) ||
+                 (week == 9 && $scope.filter['week9']) ||
+                 (week == 10 && $scope.filter['week10']);
         };
 
     }
diff --git a/templates/cardlist.html b/templates/cardlist.html
index e1defb0..d0595c9 100644
--- a/templates/cardlist.html
+++ b/templates/cardlist.html
@@ -61,16 +61,18 @@
   <ul class="collection"
       ng-repeat="(weeknum, week_cards) in cards | filter:searchText | filter:filterByDate | groupBy: 'material_week_num'">
     <li class="collection-header"><h3>Week {{weeknum}}</h3></li>
-    <li class="collection-item" ng-repeat="card in week_cards" ng-show="show || !card.is_hidden">
+    <li class="collection-item" ng-click="expand = !expand" ng-repeat="card in week_cards" ng-show="show || !card.is_hidden">
       <div>{{card.text}}
-        <a href="" ng-click="hide(card)" class="secondary-content" ng-show="!card.is_hidden"><i
-                class="mdi-action-delete small"></i></a>
-        <a href="" ng-click="unhide(card)" class="secondary-content" ng-show="card.is_hidden"><i
-                class="mdi-image-remove-red-eye small"></i></a>
-        <a href="" ng-click="pull(card)" class="secondary-content" ng-show="!card.is_in_deck"><i
-                class="mdi-content-add-circle small"></i></a>
-        <a href="" ng-click="unpull(card)" class="secondary-content" ng-show="card.is_in_deck"><i
-                class="mdi-content-remove-circle small"></i></a>
+        <span class="badge">{{dayofweek(card)}}</span>
+        <p class="right-align" ng-show="expand">
+          <a href="" ng-click="pull(card)" ng-show="!card.is_in_deck"><i
+                  class="mdi-content-add-circle-outline small"></i></a>
+          <a href="" ng-click="unpull(card)" ng-show="card.is_in_deck"><i
+                  class="mdi-content-remove-circle-outline small"></i></a>
+          <a href="" ng-click="hide(card)" ng-show="!card.is_hidden"><i
+                  class="mdi-action-delete small"></i></a>
+          <a href="" ng-click="unhide(card)" ng-show="card.is_hidden"><i
+                  class="mdi-image-remove-red-eye small"></i></a>
         </p>
       </div>
     </li>