diff --git a/UI/Index.html b/UI/Index.html
index 27872d6d8..3b9894255 100644
--- a/UI/Index.html
+++ b/UI/Index.html
@@ -104,6 +104,7 @@
 <script src="/Mixins/tablesorter.extensions.js"></script>
 <script src="/Mixins/spoon.js"></script>
 <script src="/Mixins/backbone.modelbinder.mixin.js"></script>
+<script src="/Mixins/backbone.Backgrid.mixin.js"></script>
 
 <script data-main="/app" src="/JsLibraries/require.js"></script>
 <script src="/Routing.js"></script>
diff --git a/UI/Mixins/backbone.Backgrid.mixin.js b/UI/Mixins/backbone.Backgrid.mixin.js
new file mode 100644
index 000000000..11dcacb48
--- /dev/null
+++ b/UI/Mixins/backbone.Backgrid.mixin.js
@@ -0,0 +1,83 @@
+Backgrid.SeriesStatusCell = Backgrid.Cell.extend({
+    className: "series-status-cell",
+
+    render: function () {
+        this.$el.empty();
+        var monitored = this.model.get('monitored');
+        var status = this.model.get('status');
+
+        if (!monitored) {
+            this.$el.html('<i class="icon-pause grid-icon" title="Not Monitored"></i>');
+        }
+        else if (status === 0) {
+            this.$el.html('<i class="icon-play grid-icon" title="Continuing"></i>');
+        }
+
+        else {
+            this.$el.html('<i class="icon-stop grid-icon" title="Ended"></i>');
+        }
+
+        return this;
+    }
+});
+
+Backgrid.AirDateCell = Backgrid.Cell.extend({
+    className: "air-date-cell",
+
+    render: function () {
+        this.$el.empty();
+        var airDate = this.model.get(this.column.get("name"));
+
+        this.$el.html(bestDateString(airDate));
+
+        return this;
+    }
+});
+
+Backgrid.EpisodeProgressCell = Backgrid.Cell.extend({
+    className: "episode-progress-cell",
+    template: 'Series/EpisodeProgressTemplate',
+
+    render: function () {
+        var data = this.model.toJSON();
+        var html = Marionette.Renderer.render(this.template, data);
+        this.$el.html(html);
+
+        return this;
+    }
+});
+
+Backgrid.ControlsColumnCell = Backgrid.Cell.extend({
+    className: "controls-cell",
+    template: 'Series/Index/Table/ControlsColumnTemplate',
+
+    render: function () {
+        var data = this.model.toJSON();
+        var html = Marionette.Renderer.render(this.template, data);
+        this.$el.html(html);
+
+        return this;
+    }
+});
+
+Backgrid.SeriesIndexTableRow = Backgrid.Row.extend({
+    events: {
+        'click .x-edit'  : 'editSeries',
+        'click .x-remove': 'removeSeries'
+    },
+
+    editSeries: function () {
+        var view = new NzbDrone.Series.Edit.EditSeriesView({ model: this.model});
+
+        NzbDrone.vent.trigger(NzbDrone.Events.OpenModalDialog, {
+            view: view
+        });
+    },
+
+    removeSeries: function () {
+        var view = new NzbDrone.Series.Delete.DeleteSeriesView({ model: this.model });
+        NzbDrone.vent.trigger(NzbDrone.Events.OpenModalDialog, {
+            view: view
+        });
+    }
+});
\ No newline at end of file
diff --git a/UI/Series/EpisodeProgressTemplate.html b/UI/Series/EpisodeProgressTemplate.html
new file mode 100644
index 000000000..2fa193038
--- /dev/null
+++ b/UI/Series/EpisodeProgressTemplate.html
@@ -0,0 +1,5 @@
+<div class="progress">
+    <span class="progressbar-back-text">{{episodeFileCount}} / {{episodeCount}}</span>
+
+    <div class="bar" style="width:{{percentOfEpisodes}}%"><span class="progressbar-front-text">{{episodeFileCount}} / {{episodeCount}}</span></div>
+</div>
\ No newline at end of file
diff --git a/UI/Series/Index/SeriesIndexLayout.js b/UI/Series/Index/SeriesIndexLayout.js
index e47404495..ca1235126 100644
--- a/UI/Series/Index/SeriesIndexLayout.js
+++ b/UI/Series/Index/SeriesIndexLayout.js
@@ -58,27 +58,27 @@ define([
                         name: 'nextAiring',
                         label: 'Next Airing',
                         editable: false,
-                        cell: 'datetime',
-                        formatter: new Backgrid.AirDateFormatter()
+                        cell: 'airDate'
                     },
                     {
                         name: 'episodes',
                         label: 'Episodes',
                         editable: false,
                         sortable: false,
-                        cell: 'string'
+                        cell: 'episodeProgress'
                     },
                     {
                         name: 'edit',
                         label: '',
                         editable: false,
                         sortable: false,
-                        cell: 'string'
+                        cell: 'controlsColumn'
                     }
                 ];
 
                 this.series.show(new Backgrid.Grid(
                     {
+                        row: Backgrid.SeriesIndexTableRow,
                         columns : columns,
                         collection : this.seriesCollection,
                         className: 'table table-hover'
diff --git a/UI/Series/Index/Table/ControlsColumnTemplate.html b/UI/Series/Index/Table/ControlsColumnTemplate.html
new file mode 100644
index 000000000..48f19e1df
--- /dev/null
+++ b/UI/Series/Index/Table/ControlsColumnTemplate.html
@@ -0,0 +1,2 @@
+<i class="icon-cog x-edit" title="Edit Series"></i>
+<i class="icon-remove x-remove" title="Delete Series"></i>
\ No newline at end of file
diff --git a/UI/app.js b/UI/app.js
index 092de2656..eabbaea3a 100644
--- a/UI/app.js
+++ b/UI/app.js
@@ -71,49 +71,6 @@ define('app', function () {
 
         console.log('starting application');
 
-        //TODO: move these out of here
-        Backgrid.SeriesStatusCell = Backgrid.Cell.extend({
-            className: "series-status-cell",
-
-            render: function () {
-                this.$el.empty();
-                var monitored = this.model.get('monitored');
-                var status = this.model.get('status');
-
-                if (!monitored) {
-                    this.$el.html('<i class="icon-pause grid-icon" title="Not Monitored"></i>');
-                }
-                else if (status === 0) {
-                    this.$el.html('<i class="icon-play grid-icon" title="Continuing"></i>');
-                }
-
-                else {
-                    this.$el.html('<i class="icon-stop grid-icon" title="Ended"></i>');
-                }
-
-                return this;
-            }
-        });
-
-        var AirDateFormatter = Backgrid.AirDateFormatter = function () {};
-        AirDateFormatter.prototype = new Backgrid.CellFormatter();
-        _.extend(AirDateFormatter.prototype, {
-            /**
-             Converts any value to a string using Ecmascript's implicit type
-             conversion. If the given value is `null` or `undefined`, an empty string is
-             returned instead.
-
-             @member Backgrid.StringFormatter
-             @param {*} rawValue
-             @return {string}
-             */
-            fromRaw: function (rawValue) {
-                return 'Hello World';
-
-                if (_.isUndefined(rawValue) || _.isNull(rawValue)) return '';
-                return rawValue + '';
-            }
-        });
     });
 
     NzbDrone.addRegions({
@@ -122,7 +79,6 @@ define('app', function () {
         notificationRegion: '#notification-region'
     });
 
-
     window.NzbDrone.start();
 
     return NzbDrone;