diff --git a/.gitignore b/.gitignore
index 5b6ffb3cc..14e5c939e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -137,3 +137,4 @@ NzbDrone.Web/_backboneApp/.idea/.
 *.sqo
 *.userprefs
 */test-results/*
+.idea/*
\ No newline at end of file
diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj
index db5b2eebc..12d40dae2 100644
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@@ -196,6 +196,7 @@
     <Content Include="_backboneApp\AddSeries\RootFolders\RootFolderCollection.js" />
     <Content Include="_backboneApp\Content\jquery.dataTables.bootstrap.css" />
     <Content Include="_backboneApp\Content\tablesorter.bootstrap.css" />
+    <Content Include="_backboneApp\Controller.js" />
     <Content Include="_backboneApp\JsLibraries\jquery.js" />
     <Content Include="_backboneApp\JsLibraries\jquery.tablesorter.bootstrap.js" />
     <Content Include="_backboneApp\JsLibraries\jquery.tablesorter.js" />
@@ -406,6 +407,7 @@
     <Content Include="_backboneApp\JsLibraries\backbone.js" />
     <Content Include="_backboneApp\JsLibraries\backbone.marionette.js" />
     <Content Include="_backboneApp\AddSeries\addSeriesLayoutTemplate.html" />
+    <Content Include="_backboneApp\Series\EmptySeriesCollectionTemplate.html" />
     <Content Include="_backboneApp\Series\SeriesCollectionView.js" />
     <Content Include="_backboneApp\Series\Edit\EditSeriesTemplate.html" />
     <Content Include="_backboneApp\Series\Edit\EditSeriesView.js" />
@@ -648,6 +650,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
+    <Folder Include="_backboneApp\Upcoming\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Autofac.Integration.Mvc\Autofac.Integration.Mvc.csproj">
diff --git a/NzbDrone.Web/_backboneApp/Controller.js b/NzbDrone.Web/_backboneApp/Controller.js
index aad45516d..753942d88 100644
--- a/NzbDrone.Web/_backboneApp/Controller.js
+++ b/NzbDrone.Web/_backboneApp/Controller.js
@@ -10,7 +10,6 @@
         series: function (action, query) {
             NzbDrone.mainRegion.show(new NzbDrone.Series.SeriesCollectionView(this, action, query));
             this.setTitle('NzbDrone');
-
         },
 
         notFound: function () {
diff --git a/NzbDrone.Web/_backboneApp/Routing.js b/NzbDrone.Web/_backboneApp/Routing.js
index e75abc97a..656d61ca9 100644
--- a/NzbDrone.Web/_backboneApp/Routing.js
+++ b/NzbDrone.Web/_backboneApp/Routing.js
@@ -13,7 +13,6 @@
         }
     });
 
-
     NzbDrone.addInitializer(function () {
 
         NzbDrone.Router = new NzbDrone.Router();
diff --git a/NzbDrone.Web/_backboneApp/Series/EmptySeriesCollectionTemplate.html b/NzbDrone.Web/_backboneApp/Series/EmptySeriesCollectionTemplate.html
new file mode 100644
index 000000000..0b54712fc
--- /dev/null
+++ b/NzbDrone.Web/_backboneApp/Series/EmptySeriesCollectionTemplate.html
@@ -0,0 +1 @@
+<td colspan="8">No series found</td>
\ No newline at end of file
diff --git a/NzbDrone.Web/_backboneApp/Series/SeriesCollectionView.js b/NzbDrone.Web/_backboneApp/Series/SeriesCollectionView.js
index dab677063..a295dfc94 100644
--- a/NzbDrone.Web/_backboneApp/Series/SeriesCollectionView.js
+++ b/NzbDrone.Web/_backboneApp/Series/SeriesCollectionView.js
@@ -6,9 +6,12 @@ define(['app', 'Quality/QualityProfileCollection', 'Series/SeriesItemView'], fun
         itemViewContainer: 'tbody',
         template: 'Series/SeriesCollectionTemplate',
         qualityProfileCollection: qualityProfileCollection,
+        emptyView: NzbDrone.Series.EmptySeriesCollectionView,
 
         initialize: function () {
             this.collection = new NzbDrone.Series.SeriesCollection();
+            //Todo: This caused the onRendered event to be trigger twice, which displays two empty collection messages
+            //http://stackoverflow.com/questions/13065176/backbone-marionette-composit-view-onrender-executing-twice
             this.collection.fetch();
             this.qualityProfileCollection.fetch();
 
@@ -19,7 +22,6 @@ define(['app', 'Quality/QualityProfileCollection', 'Series/SeriesItemView'], fun
             table : '.x-series-table'
         },
 
-
         onItemRemoved: function()
         {
             this.ui.table.trigger('update');
@@ -84,5 +86,9 @@ define(['app', 'Quality/QualityProfileCollection', 'Series/SeriesItemView'], fun
             }
         }
     });
+});
 
+NzbDrone.Series.EmptySeriesCollectionView = Backbone.Marionette.CompositeView.extend({
+    template: 'Series/EmptySeriesCollectionTemplate',
+    tagName: 'tr'
 });
\ No newline at end of file
diff --git a/NzbDrone.Web/_backboneApp/Series/SeriesModel.js b/NzbDrone.Web/_backboneApp/Series/SeriesModel.js
index b2b28946f..6dc10e9de 100644
--- a/NzbDrone.Web/_backboneApp/Series/SeriesModel.js
+++ b/NzbDrone.Web/_backboneApp/Series/SeriesModel.js
@@ -1,6 +1,4 @@
 define(['app', 'Quality/QualityProfileCollection'], function (app, qualityProfileCollection) {
-
-
     NzbDrone.Series.SeriesModel = Backbone.Model.extend({
 
         mutators: {
@@ -33,8 +31,6 @@
             }
         },
 
-
-
         defaults: {
             episodeFileCount: 0,
             episodeCount: 0,
diff --git a/NzbDrone.Web/_backboneApp/app.js b/NzbDrone.Web/_backboneApp/app.js
index dd83d795d..e89d1cc7a 100644
--- a/NzbDrone.Web/_backboneApp/app.js
+++ b/NzbDrone.Web/_backboneApp/app.js
@@ -48,7 +48,6 @@ define('app',  function () {
             ApiRoot: '/api'
         };
 
-
         window.NzbDrone.addInitializer(function () {
 
             console.log('starting application');
diff --git a/NzbDrone/NzbDrone.Console.csproj b/NzbDrone/NzbDrone.Console.csproj
index e59b63af6..2dd5c15f4 100644
--- a/NzbDrone/NzbDrone.Console.csproj
+++ b/NzbDrone/NzbDrone.Console.csproj
@@ -74,13 +74,13 @@
     <IntermediateOutputPath>C:\Users\Mark\AppData\Local\Temp\vs1A55.tmp\x86\Mono\</IntermediateOutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=2.6.3.862, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+    <Reference Include="Autofac, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.dll</HintPath>
+      <HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.dll</HintPath>
     </Reference>
-    <Reference Include="Autofac.Configuration, Version=2.6.3.862, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+    <Reference Include="Autofac.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.Configuration.dll</HintPath>
+      <HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>True</EmbedInteropTypes>