diff --git a/public/templates/directives/albums-list.html b/public/templates/directives/albums-list.html
index d541c419..a6e16c06 100644
--- a/public/templates/directives/albums-list.html
+++ b/public/templates/directives/albums-list.html
@@ -15,7 +15,7 @@
             </span>
         </a>
     </li>
-    <li ng-show="!albums.length" class="empty">
+    <li ng-if="!albums.length" class="empty">
         No albums found&hellip;
     </li>
 </ul>
diff --git a/public/templates/directives/playlists-list.html b/public/templates/directives/playlists-list.html
index c21b4596..28cd98ea 100644
--- a/public/templates/directives/playlists-list.html
+++ b/public/templates/directives/playlists-list.html
@@ -15,7 +15,7 @@
             </span>
         </a>
     </li>
-    <li ng-show="!playlists.length" class="empty">
+    <li ng-if="!playlists.length" class="empty">
         No playlists found&hellip;
     </li>
 </ul>
diff --git a/public/templates/directives/tracks-list.html b/public/templates/directives/tracks-list.html
index 5c626e2b..dcb4416b 100644
--- a/public/templates/directives/tracks-list.html
+++ b/public/templates/directives/tracks-list.html
@@ -1,21 +1,21 @@
-<ul class="tracks-listing {{class}}">
+<ul class="tracks-listing {{::class}}">
     <li ng-repeat="track in tracks track by track.id" ng-class="{'can-favourite': auth.isLogged, 'is-favourited': auth.isLogged && track.user_data.is_favourited, 'is-playing': track.isPlaying, 'has-played': auth.isLogged && track.user_data.views}">
         <div class="image">
             <a href="#" class="play-button" pfm-eat-click ng-click="play(track)">
-                <i class="icon-play" ng-show="!track.isPlaying"></i>
-                <i class="icon-pause" ng-hide="!track.isPlaying"></i>
+                <i class="icon-play" ng-if="!track.isPlaying"></i>
+                <i class="icon-pause" ng-if="track.isPlaying"></i>
             </a>
             <img pfm-src-loader="track.covers.thumbnail" pfm-src-size="thumbnail" />
         </div>
         <div class="icons">
             <span><i ng-class="::{'icon-microphone-off': !track.is_vocal, 'icon-microphone': track.is_vocal}"></i></span>
-            <a pfm-eat-click class="icon-favourite" href="#" ng-click="toggleFavourite(track)" ng-show="::auth.isLogged">
+            <a pfm-eat-click class="icon-favourite" href="#" ng-click="toggleFavourite(track)" ng-if="::auth.isLogged">
                 <i class="icon-star-empty"></i>
             </a>
         </div>
         <a class="info" ng-href="{{::track.url}}">
             <span class="title">{{::track.title}}</span>
-            <span class="stats" title="track.stats.favourites +' Favourites / '+ track.stats.comments +' Comments / '+ track.stats.plays +' Plays'">
+            <span class="stats" title="{{::track.stats.favourites}} Favourites / {{:: track.stats.comments}} Comments / {{::track.stats.plays}} Plays">
                 <strong>{{::track.stats.favourites}}</strong>f
                 <strong>{{::track.stats.comments}}</strong>c
                 <strong>{{::track.stats.plays}}</strong>p