diff --git a/grails-app/assets/javascripts/streama/templates/admin-movies.tpl.htm b/grails-app/assets/javascripts/streama/templates/admin-movies.tpl.htm
index 30b56c5a..55d356d6 100644
--- a/grails-app/assets/javascripts/streama/templates/admin-movies.tpl.htm
+++ b/grails-app/assets/javascripts/streama/templates/admin-movies.tpl.htm
@@ -5,8 +5,6 @@ <h1>
       <video-sort-order-dropdown ng-model="vm.movie.sorter" ng-model-options="{getterSetter: true}" dropdown-type="'movie'"/>
     </h1>
 
-    <input placeholder="{{vm.searchText}}" type="text" ng-model="vm.movie.filter.title" ng-change="vm.doSearch(vm.movie.filter.title)"
-           ng-model-options="{debounce: 333}" class="form-control input-sm" />
   </div>
   <div class="col-md-6">
     <br>
@@ -17,6 +15,13 @@ <h1>
   </div>
 </div>
 
+<div class="row">
+  <div class="col-md-5">
+    <input placeholder="{{vm.searchText}}" type="text" ng-model="vm.movie.filter.title" ng-change="vm.doSearch(vm.movie.filter.title)"
+           ng-model-options="{debounce: 333}" class="form-control input-sm" />
+  </div>
+</div>
+
 <div class="spinner big" ng-show="vm.movie.isLoading">
   <div class="bounce1"></div>
   <div class="bounce2"></div>
diff --git a/grails-app/assets/javascripts/streama/templates/admin-shows.tpl.htm b/grails-app/assets/javascripts/streama/templates/admin-shows.tpl.htm
index 95c775a9..bc1f345e 100644
--- a/grails-app/assets/javascripts/streama/templates/admin-shows.tpl.htm
+++ b/grails-app/assets/javascripts/streama/templates/admin-shows.tpl.htm
@@ -4,8 +4,8 @@ <h1>
       Shows <span class="text-muted text-xs">({{tvShow.total}} items)</span>
       <video-sort-order-dropdown ng-model="tvShow.sorter"  ng-model-options="{getterSetter: true}" dropdown-type="'tvShow'"/>
     </h1>
-  </div>
 
+  </div>
   <div class="col-md-6">
     <br>
     <div class="btn-group pull-right">
@@ -15,7 +15,6 @@ <h1>
   </div>
 </div>
 
-
 <div class="row">
   <div class="col-md-5">
     <input placeholder="{{searchText}}" type="text" ng-model="tvShow.filter.name" ng-change="doSearch(tvShow.filter.name)"
diff --git a/grails-app/assets/javascripts/streama/templates/admin-videos.tpl.htm b/grails-app/assets/javascripts/streama/templates/admin-videos.tpl.htm
index e63d85f0..2210fe28 100644
--- a/grails-app/assets/javascripts/streama/templates/admin-videos.tpl.htm
+++ b/grails-app/assets/javascripts/streama/templates/admin-videos.tpl.htm
@@ -1,9 +1,18 @@
-<button class="btn btn-primary pull-right btn-lg" ng-click="openGenericVideoModal()">Create generic video</button>
+<div class="row">
+  <div class="col-md-6">
+    <h1>
+      Other Videos <span class="text-muted text-xs">({{videos.length}} items)</span>
+      <video-sort-order-dropdown ng-model="currentSort" dropdown-type="'movie'"/>
+    </h1>
 
-<h1>
-  Other Videos <span class="text-muted text-xs">({{videos.length}} items)</span>
-  <video-sort-order-dropdown ng-model="currentSort" dropdown-type="'movie'"/>
-</h1>
+  </div>
+  <div class="col-md-6">
+    <br>
+    <div class="btn-group pull-right">
+      <button class="btn btn-primary" ng-click="openGenericVideoModal()">Create generic video</button>
+    </div>
+  </div>
+</div>
 
 <div class="row">
   <div class="col-md-5">
@@ -37,5 +46,3 @@ <h4>{{::video.title}}</h4>
     </div>
   </div>
 </div>
-
-