diff --git a/src/Ombi/ClientApp/app/search/search.component.html b/src/Ombi/ClientApp/app/search/search.component.html
index e82457259..3226360bc 100644
--- a/src/Ombi/ClientApp/app/search/search.component.html
+++ b/src/Ombi/ClientApp/app/search/search.component.html
@@ -7,11 +7,11 @@
 <ul id="nav-tabs" class="nav nav-tabs" role="tablist">
 
     <li role="presentation" class="active">
-        <a id="movieTabButton" href="#MoviesTab" aria-controls="home" role="tab" data-toggle="tab" (click)="selectTab()"><i class="fa fa-film"></i> Movies</a>
+        <a id="movieTabButton" href="#MoviesTab" aria-controls="home" role="tab" data-toggle="tab" (click)="selectMovieTab()"><i class="fa fa-film"></i> Movies</a>
     </li>
     
     <li role="presentation">
-        <a id="tvTabButton" href="#TvShowTab" aria-controls="profile" role="tab" data-toggle="tab" (click)="selectTab()"><i class="fa fa-television"></i> TV Shows</a>
+        <a id="tvTabButton" href="#TvShowTab" aria-controls="profile" role="tab" data-toggle="tab" (click)="selectTvTab()"><i class="fa fa-television"></i> TV Shows</a>
     </li>
 </ul>
 
diff --git a/src/Ombi/ClientApp/app/search/search.component.ts b/src/Ombi/ClientApp/app/search/search.component.ts
index 8f3a2d5e5..312847b74 100644
--- a/src/Ombi/ClientApp/app/search/search.component.ts
+++ b/src/Ombi/ClientApp/app/search/search.component.ts
@@ -11,8 +11,13 @@ export class SearchComponent implements OnInit  {
         this.showTv = false;
     }
 
-    public selectTab() {
-        this.showMovie = !this.showMovie;
-        this.showTv = !this.showTv;
+    public selectMovieTab() {
+        this.showMovie = true;
+        this.showTv = false;
+    } 
+
+    public selectTvTab() {
+        this.showMovie = true;
+        this.showTv = false;
     }
 }
diff --git a/src/Ombi/Ombi.csproj b/src/Ombi/Ombi.csproj
index 3e5a696a3..e3d8ab89f 100644
--- a/src/Ombi/Ombi.csproj
+++ b/src/Ombi/Ombi.csproj
@@ -32,23 +32,7 @@
     <None Remove="wwwroot\dist\**" />
   </ItemGroup>
 
-  <Target Name="NpmCommandsDebug" Condition="'$(Configuration)'=='Debug'" AfterTargets="Build">
-    <Exec Command="npm run vendor" />
-  </Target>
-  <!--<Target Name="NpmCommandsRelease" Condition="'$(Configuration)'=='Release'" AfterTargets="Build">
-    <Exec Command="npm run publish" />
-  </Target>-->
-  
-  <Target Name="RunWebpack" AfterTargets="ComputeFilesToPublish">
-    <ItemGroup>
-      <DistFiles Include="wwwroot\dist\**" />
-      <ResolvedFileToPublish Include="@(DistFiles->'%(FullPath)')" Exclude="@(ResolvedFileToPublish)">
-        <RelativePath>%(DistFiles.Identity)</RelativePath>
-        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      </ResolvedFileToPublish>
-    </ItemGroup>
-  </Target>
-  
+
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="6.1.1" />
diff --git a/src/Ombi/gulpfile.js b/src/Ombi/gulpfile.js
index 80943de6c..7cda90d8d 100644
--- a/src/Ombi/gulpfile.js
+++ b/src/Ombi/gulpfile.js
@@ -1,4 +1,4 @@
-/// <binding BeforeBuild='vendor' />
+/// <binding BeforeBuild='vendor, build' />
 'use strict'; 
 
 const gulp = require('gulp');
diff --git a/src/Ombi/wwwroot/loading.css b/src/Ombi/wwwroot/loading.css
index a8f5b39d6..084715a25 100644
--- a/src/Ombi/wwwroot/loading.css
+++ b/src/Ombi/wwwroot/loading.css
@@ -10,6 +10,7 @@
     left: 0;
     right: 0;
     background-color: #1f1f1f;
+    color: white;
 }
 
 .app-loading {