diff --git a/NzbDrone.ncrunchsolution b/NzbDrone.ncrunchsolution
index 444b34b1d..6cb47a29a 100644
--- a/NzbDrone.ncrunchsolution
+++ b/NzbDrone.ncrunchsolution
@@ -2,7 +2,6 @@
   <FileVersion>1</FileVersion>
   <AutoEnableOnStartup>False</AutoEnableOnStartup>
   <AllowParallelTestExecution>true</AllowParallelTestExecution>
-  <AllowTestsToRunInParallelWithThemselves>true</AllowTestsToRunInParallelWithThemselves>
   <FrameworkUtilisationTypeForNUnit>UseDynamicAnalysis</FrameworkUtilisationTypeForNUnit>
   <FrameworkUtilisationTypeForGallio>Disabled</FrameworkUtilisationTypeForGallio>
   <FrameworkUtilisationTypeForMSpec>Disabled</FrameworkUtilisationTypeForMSpec>
diff --git a/UI/.idea/jsLibraryMappings.xml b/UI/.idea/jsLibraryMappings.xml
index 03911505b..5fe165e16 100644
--- a/UI/.idea/jsLibraryMappings.xml
+++ b/UI/.idea/jsLibraryMappings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="JavaScriptLibraryMappings">
-    <file url="PROJECT" libraries="{backbone.backgrid.filter.js, jQuery-1.9.1}" />
+    <file url="PROJECT" libraries="{backbone.backgrid.filter.js}" />
   </component>
 </project>
 
diff --git a/UI/Episode/Layout.js b/UI/Episode/Layout.js
index e7481f498..6e51c6670 100644
--- a/UI/Episode/Layout.js
+++ b/UI/Episode/Layout.js
@@ -30,7 +30,7 @@ define(
 
             onShow: function () {
                 this._showSummary();
-                this._releaseSearchActivated = false;
+                this.searchLayout = new SearchLayout({ model: this.model });
             },
 
 
@@ -58,7 +58,7 @@ define(
                 }
 
                 this.ui.search.tab('show');
-                this.search.show(new SearchLayout({ model: this.model }));
+                this.search.show(this.searchLayout);
             }
 
         });
diff --git a/UI/Episode/Search/ButtonsView.js b/UI/Episode/Search/ButtonsView.js
new file mode 100644
index 000000000..6daa5abb4
--- /dev/null
+++ b/UI/Episode/Search/ButtonsView.js
@@ -0,0 +1,11 @@
+'use strict';
+define(
+    [
+        'app',
+        'marionette'
+    ], function (App, Marionette) {
+
+        return Marionette.ItemView.extend({
+            template: 'Episode/Search/ButtonsViewTemplate'
+        });
+    });
diff --git a/UI/Episode/Search/ButtonsViewTemplate.html b/UI/Episode/Search/ButtonsViewTemplate.html
new file mode 100644
index 000000000..96456d3f4
--- /dev/null
+++ b/UI/Episode/Search/ButtonsViewTemplate.html
@@ -0,0 +1,4 @@
+<div class="search-buttons">
+    <button class="btn btn-large btn-block x-search-auto"><i class="icon-rocket"/> Automatic Search</button>
+    <button class="btn btn-large btn-block btn-primary x-search-manual"><i class="icon-user"/> Manual Search</button>
+</div>
\ No newline at end of file
diff --git a/UI/Episode/Search/Layout.js b/UI/Episode/Search/Layout.js
index 300b99a87..e6cbd1c61 100644
--- a/UI/Episode/Search/Layout.js
+++ b/UI/Episode/Search/Layout.js
@@ -3,12 +3,13 @@ define(
     [
         'app',
         'marionette',
+        'Episode/Search/ButtonsView',
         'Episode/Search/ManualLayout',
         'Release/Collection',
         'Shared/SpinnerView',
         'Shared/Messenger',
         'Commands/CommandController'
-    ], function (App, Marionette, ManualSearchLayout, ReleaseCollection, SpinnerView, Messenger, CommandController) {
+    ], function (App, Marionette, ButtonsView, ManualSearchLayout, ReleaseCollection, SpinnerView, Messenger, CommandController) {
 
         return Marionette.Layout.extend({
             template: 'Episode/Search/LayoutTemplate',
@@ -18,12 +19,17 @@ define(
             },
 
             events: {
-                'click .x-search-auto': '_searchAuto',
-                'click .x-search-manual': '_searchManual'
+                'click .x-search-auto'  : '_searchAuto',
+                'click .x-search-manual': '_searchManual',
+                'click .x-search-back'  : '_showButtons'
+            },
+
+            initialize: function () {
+                this.mainView = new ButtonsView();
             },
 
             onShow: function () {
-                this._releaseSearchActivated = false;
+                this._showMainView();
             },
 
             _searchAuto: function (e) {
@@ -50,22 +56,29 @@ define(
                     e.preventDefault();
                 }
 
-                if (this._releaseSearchActivated) {
-                    return;
-                }
-
                 var self = this;
 
-                this.main.show(new SpinnerView());
+                this.mainView = new SpinnerView();
+                this._showMainView();
 
                 var releases = new ReleaseCollection();
                 var promise = releases.fetchEpisodeReleases(this.model.id);
 
                 promise.done(function () {
                     if (!self.isClosed) {
-                        self.main.show(new ManualSearchLayout({collection: releases}));
+                        self.mainView = new ManualSearchLayout({collection: releases});
+                        self._showMainView();
                     }
                 });
+            },
+
+            _showMainView: function () {
+                this.main.show(this.mainView);
+            },
+
+            _showButtons: function () {
+                this.mainView = new ButtonsView();
+                this._showMainView();
             }
         });
 
diff --git a/UI/Episode/Search/LayoutTemplate.html b/UI/Episode/Search/LayoutTemplate.html
index 547d6d631..a0db76df8 100644
--- a/UI/Episode/Search/LayoutTemplate.html
+++ b/UI/Episode/Search/LayoutTemplate.html
@@ -1,7 +1 @@
-
-<div id="episode-search-region">
-    <div class="search-buttons">
-        <button class="btn btn-large btn-block x-search-auto"><i class="icon-rocket"/> Automatic Search</button>
-        <button class="btn btn-large btn-block btn-primary x-search-manual"><i class="icon-user"/> Manual Search</button>
-    </div>
-</div>
\ No newline at end of file
+<div id="episode-search-region"></div>
\ No newline at end of file
diff --git a/UI/Episode/Search/ManualLayoutTemplate.html b/UI/Episode/Search/ManualLayoutTemplate.html
index d90cd597d..84945e3bb 100644
--- a/UI/Episode/Search/ManualLayoutTemplate.html
+++ b/UI/Episode/Search/ManualLayoutTemplate.html
@@ -1 +1,2 @@
 <div id="episode-release-grid"/>
+<button class="btn x-search-back">Back</button>
\ No newline at end of file