diff --git a/UI/AddSeries/RootFolders/Layout.js b/UI/AddSeries/RootFolders/Layout.js
index b0030f374..89388b2c2 100644
--- a/UI/AddSeries/RootFolders/Layout.js
+++ b/UI/AddSeries/RootFolders/Layout.js
@@ -6,8 +6,9 @@ define(
         'AddSeries/RootFolders/CollectionView',
         'AddSeries/RootFolders/Collection',
         'AddSeries/RootFolders/Model',
+        'Shared/LoadingView',
         'Mixins/AutoComplete'
-    ], function (Marionette, RootFolderCollectionView, RootFolderCollection, RootFolderModel) {
+    ], function (Marionette, RootFolderCollectionView, RootFolderCollection, RootFolderModel, LoadingView) {
 
         return Marionette.Layout.extend({
             template: 'AddSeries/RootFolders/LayoutTemplate',
@@ -33,6 +34,7 @@ define(
 
             onRender: function () {
                 var self = this;
+                this.currentDirs.show(new LoadingView());
 
                 RootFolderCollection.promise.done(function () {
                     self.currentDirs.show(self.rootfolderListView);
diff --git a/UI/AddSeries/RootFolders/LayoutTemplate.html b/UI/AddSeries/RootFolders/LayoutTemplate.html
index 6b466dc0f..2a5d5f350 100644
--- a/UI/AddSeries/RootFolders/LayoutTemplate.html
+++ b/UI/AddSeries/RootFolders/LayoutTemplate.html
@@ -11,7 +11,7 @@
     {{#if items}}
     <h4>Recent Folders</h4>
     {{/if}}
-    <div id="current-dirs" class="root-folders-list">loading ...</div>
+    <div id="current-dirs" class="root-folders-list"></div>
 </div>
 <div class="modal-footer">
     <button class="btn" data-dismiss="modal">close</button>
diff --git a/UI/Episode/Search/Layout.js b/UI/Episode/Search/Layout.js
index f34cccbc7..08acca75d 100644
--- a/UI/Episode/Search/Layout.js
+++ b/UI/Episode/Search/Layout.js
@@ -6,11 +6,11 @@ define(
         'Episode/Search/ButtonsView',
         'Episode/Search/ManualLayout',
         'Release/Collection',
-        'Shared/SpinnerView',
+        'Shared/LoadingView',
         'Shared/Messenger',
         'Commands/CommandController',
         'Shared/FormatHelpers'
-    ], function (App, Marionette, ButtonsView, ManualSearchLayout, ReleaseCollection, SpinnerView, Messenger, CommandController, FormatHelpers) {
+    ], function (App, Marionette, ButtonsView, ManualSearchLayout, ReleaseCollection, LoadingView, Messenger, CommandController, FormatHelpers) {
 
         return Marionette.Layout.extend({
             template: 'Episode/Search/LayoutTemplate',
@@ -59,7 +59,7 @@ define(
 
                 var self = this;
 
-                this.mainView = new SpinnerView();
+                this.mainView = new LoadingView();
                 this._showMainView();
 
                 var releases = new ReleaseCollection();
diff --git a/UI/Episode/Summary/EpisodeSummaryLayout.js b/UI/Episode/Summary/EpisodeSummaryLayout.js
index 3861179f1..3065a8946 100644
--- a/UI/Episode/Summary/EpisodeSummaryLayout.js
+++ b/UI/Episode/Summary/EpisodeSummaryLayout.js
@@ -8,8 +8,9 @@ define(
         'Series/EpisodeFileCollection',
         'Cells/FileSizeCell',
         'Cells/QualityCell',
-        'Episode/Summary/NoFileView'
-    ], function (App, Marionette, Backgrid, EpisodeFileModel, EpisodeFileCollection, FileSizeCell, QualityCell, NoFileView) {
+        'Episode/Summary/NoFileView',
+        'Shared/LoadingView'
+    ], function (App, Marionette, Backgrid, EpisodeFileModel, EpisodeFileCollection, FileSizeCell, QualityCell, NoFileView, LoadingView) {
 
         return Marionette.Layout.extend({
             template: 'Episode/Summary/EpisodeSummaryLayoutTemplate',
@@ -61,6 +62,8 @@ define(
                     }
 
                     else {
+                        this.activity.show(new LoadingView());
+
                         var self = this;
                         var newEpisodeFile = new EpisodeFileModel({ id: episodeFileId });
                         var newEpisodeFileCollection = new EpisodeFileCollection(newEpisodeFile, { seriesId: this.model.get('seriesId') });
diff --git a/UI/Release/Layout.js b/UI/Release/Layout.js
index 32a73e2e0..05fd8e30b 100644
--- a/UI/Release/Layout.js
+++ b/UI/Release/Layout.js
@@ -9,8 +9,8 @@ define(
         'Cells/FileSizeCell',
         'Cells/QualityCell',
         'Cells/ApprovalStatusCell',
-        'Shared/SpinnerView'
-    ], function (Marionette, Backgrid, ReleaseCollection, IndexerCell, EpisodeNumberCell, FileSizeCell, QualityCell, ApprovalStatusCell, SpinnerView) {
+        'Shared/LoadingView'
+    ], function (Marionette, Backgrid, ReleaseCollection, IndexerCell, EpisodeNumberCell, FileSizeCell, QualityCell, ApprovalStatusCell, LoadingView) {
         return Marionette.Layout.extend({
             template: 'Release/LayoutTemplate',
 
@@ -80,7 +80,7 @@ define(
 
                 var self = this;
 
-                this.grid.show(new SpinnerView());
+                this.grid.show(new LoadingView());
 
                 this.fetchPromise.done(function () {
                     self.showTable();
diff --git a/UI/Shared/LoadingTemplate.html b/UI/Shared/LoadingTemplate.html
index 76a55ea86..702dcaf07 100644
--- a/UI/Shared/LoadingTemplate.html
+++ b/UI/Shared/LoadingTemplate.html
@@ -1 +1,8 @@
-loading ...
+<div class="row">
+    <div id="followingBalls">
+        <div id="ball-1" class="ball"></div>
+        <div id="ball-2" class="ball"></div>
+        <div id="ball-3" class="ball"></div>
+        <div id="ball-4" class="ball"></div>
+    </div>
+</div>
diff --git a/UI/Shared/SpinnerTemplate.html b/UI/Shared/SpinnerTemplate.html
deleted file mode 100644
index 702dcaf07..000000000
--- a/UI/Shared/SpinnerTemplate.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="row">
-    <div id="followingBalls">
-        <div id="ball-1" class="ball"></div>
-        <div id="ball-2" class="ball"></div>
-        <div id="ball-3" class="ball"></div>
-        <div id="ball-4" class="ball"></div>
-    </div>
-</div>
diff --git a/UI/Shared/SpinnerView.js b/UI/Shared/SpinnerView.js
deleted file mode 100644
index afaa742f2..000000000
--- a/UI/Shared/SpinnerView.js
+++ /dev/null
@@ -1,12 +0,0 @@
-'use strict';
-
-define(
-    [
-        'marionette'
-    ], function (Marionette) {
-        return Marionette.ItemView.extend({
-            template : 'Shared/SpinnerTemplate',
-        });
-    });
-
-