diff --git a/NzbDrone.Web/Scripts/NzbDrone/seriesDetails.js b/NzbDrone.Web/Scripts/NzbDrone/seriesDetails.js
index dc8aeea23..066f83924 100644
--- a/NzbDrone.Web/Scripts/NzbDrone/seriesDetails.js
+++ b/NzbDrone.Web/Scripts/NzbDrone/seriesDetails.js
@@ -36,7 +36,7 @@ $(".ignoreEpisode").live("click", function () {
     ignored = !ignored;
 
     if (toggle.hasClass('ignoredEpisodesMaster')) {
-        seasonNumber = toggle.attr('class').split(/\s+/)[2].replace('ignoreSeason_', '');
+        seasonNumber = toggle.attr('data-season');
 
         toggleChildren(seasonNumber, ignored);
         toggleMasters(seasonNumber, ignored);
@@ -45,13 +45,13 @@ $(".ignoreEpisode").live("click", function () {
 
     else {
         //Check to see if this is the last one ignored or the first not ignored
-        var episodeId = toggle.attr('id');
+        var episodeId = toggle.attr('data-episode-id');
         saveEpisodeIgnore(episodeId, ignored);
     }
 });
 
 function toggleChildren(seasonNumber, ignored) {
-    var ignoreEpisodes = $('.ignoreEpisode_' + seasonNumber);
+    var ignoreEpisodes = $('[data-season="' + seasonNumber + '"]');
 
     if (ignored) {
         ignoreEpisodes.each(function (index) {
@@ -100,7 +100,7 @@ function toggleCellColour(toggle, ignored) {
         toggle.parent('td').removeClass('episodeIgnored');
 
         //check to see if episode is missing
-        if (toggle.parent('td').children('.statusImage').hasClass('status-Missing'))
+        if (toggle.parent('td').children('.statusImage').attr('data-status') === 'Missing')
             toggle.parent('td').addClass('episodeMissing');
     }
 }
diff --git a/NzbDrone.Web/Views/Series/Details.cshtml b/NzbDrone.Web/Views/Series/Details.cshtml
index 34c7a3153..06e14ae2b 100644
--- a/NzbDrone.Web/Views/Series/Details.cshtml
+++ b/NzbDrone.Web/Views/Series/Details.cshtml
@@ -87,11 +87,11 @@
 <div class="seasonToggleTopGroup">
     @foreach (var season in Model.Seasons.OrderBy(s => s.SeasonNumber))
     {
-        var ignoreSeason = "ignoreSeason_" + season.SeasonNumber;
         <div class="seasonToggleTop">
-            <img src='../../Content/Images/@(season.Ignored ? "ignored" : "notIgnored").png'
-                 class='ignoredEpisodesMaster ignoreEpisode @ignoreSeason@(season.Ignored ? " ignored" : " ") gridAction'
-                 title='Click to toggle season ignore status' />
+            <img src="../../Content/Images/@(season.Ignored ? "ignored" : "notIgnored").png"
+                 class="ignoredEpisodesMaster ignoreEpisode @(season.Ignored ? " ignored" : " ") gridAction"
+                 title="Click to toggle season ignore status"
+                 data-season="@season.SeasonNumber"/>
             <a href="@string.Format("#SeasonSection_{0}", season.SeasonNumber)" class="seasonToggleLabel">@(season.SeasonNumber == 0 ? "Specials" : "Season " + season.SeasonNumber)</a>
         </div>
     }
diff --git a/NzbDrone.Web/Views/Series/Episode.cshtml b/NzbDrone.Web/Views/Series/Episode.cshtml
index fac8a3efb..74fd4880a 100644
--- a/NzbDrone.Web/Views/Series/Episode.cshtml
+++ b/NzbDrone.Web/Views/Series/Episode.cshtml
@@ -1,4 +1,3 @@
-
 @using NzbDrone.Web.Helpers
 @model NzbDrone.Web.Models.EpisodeModel
 
@@ -24,10 +23,10 @@
 
     @*Commands Column*@
     <td class="@cellColourClass">
-        <img src='../../Content/Images/@(Model.Ignored ? "ignored" : "notIgnored").png' class='ignoreEpisode ignoreEpisode_@(Model.SeasonNumber)@(Model.Ignored ? " ignored" : " ") gridAction' id='@Model.EpisodeId' title='Click to toggle episode ignore status' />
+        <img src='../../Content/Images/@(Model.Ignored ? "ignored" : "notIgnored").png' class="ignoreEpisode @(Model.Ignored ? " ignored" : " ") gridAction" title="Click to toggle episode ignore status" data-season="@Model.SeasonNumber" data-episode-id="@Model.EpisodeId" />
         @Ajax.ImageActionLink("../../Content/Images/Search.png", new { Alt = "Search", Title = "Search for episode", @class = "gridAction" }, "Search", "Episode", new { episodeId = Model.EpisodeId }, null, null)
-        <img src='../../Content/Images/changequality.png' class='changeQuality gridAction' title='Click to change the quality of the episode file' data-changetype="episode"/>
-        <img src='../../Content/Images/@(Model.Status).png' alt='@Model.Status' title='@Model.Status' class='gridImage status-@Model.Status statusImage' />
+        <img src="../../Content/Images/changequality.png" class="changeQuality gridAction" title="Click to change the quality of the episode file" data-changetype="episode"/>
+        <img src="../../Content/Images/@(Model.Status).png" alt="@Model.Status" title="@Model.Status" class="gridImage statusImage" data-status="@Model.Status" />
     </td>
 </tr>
 <tr class="detail-row@(ViewData["AltRow"] == null || !(bool)ViewData["AltRow"] ? "" : " alt-row")">
diff --git a/NzbDrone.Web/Views/Series/Season.cshtml b/NzbDrone.Web/Views/Series/Season.cshtml
index 8a24029c4..828b0c846 100644
--- a/NzbDrone.Web/Views/Series/Season.cshtml
+++ b/NzbDrone.Web/Views/Series/Season.cshtml
@@ -22,9 +22,9 @@
         
             @*Commands Column*@
             <th>
-                <img src='../../Content/Images/@(Model.Ignored ? "ignored" : "notIgnored").png' class='ignoredEpisodesMaster ignoreEpisode ignoreSeason_@(Model.SeasonNumber)@(Model.Ignored ? " ignored" : " ") gridAction' title='Click to toggle season ignore status' />
+                <img src="../../Content/Images/@(Model.Ignored ? "ignored" : "notIgnored").png" class="ignoredEpisodesMaster ignoreEpisode @(Model.Ignored ? " ignored" : " ") gridAction" title="Click to toggle season ignore status" data-season="@Model.SeasonNumber"/>
                 @Ajax.ImageActionLink("../../Content/Images/Search.png", new { Alt = "Search", Title = "Search for all episodes in this season", @class = "gridAction" }, "SearchSeason", "Episode", new { SeriesId = Model.SeriesId, SeasonNumber = Model.SeasonNumber }, null, null)
-                <img src='../../Content/Images/changequality.png' class='changeQuality gridAction' title='Click to change the quality of all episode files in this season' data-changetype="season"/>
+                <img src="../../Content/Images/changequality.png" class="changeQuality gridAction" title="Click to change the quality of all episode files in this season" data-changetype="season"/>
                 @Ajax.ImageActionLink("../../Content/Images/Rename.png", new { Alt = "Rename", Title = "Rename all episodes in this season", @class = "gridAction" }, "RenameSeason", "Episode", new { SeriesId = Model.SeriesId, SeasonNumber = Model.SeasonNumber }, null, null)
             </th>
         </tr>