diff --git a/views/search/_software_search_form.html.erb b/views/search/_software_search_form.html.erb
index ece863a..d3aba37 100644
--- a/views/search/_software_search_form.html.erb
+++ b/views/search/_software_search_form.html.erb
@@ -1,11 +1,13 @@
-<div class='search-form'>
-  <h3> <%= _("Search Public Software Catalog") %> </h3>
+<div>
+  <div class='search-form'>
+    <h3> <%= _("Search Public Software Catalog") %> </h3>
 
-  <%= form_tag( { :controller => 'search', :action => @asset ? @asset : 'index', :asset => nil, :category_path => ( @category ? @category.path : nil ) },
-                 :method => 'get', :class => 'search_form' ) do %>
+    <%= form_tag( { :controller => 'search', :action => @asset ? @asset : 'index', :asset => nil, :category_path => ( @category ? @category.path : nil ) },
+    :method => 'get', :class => 'search_form' ) do %>
 
     <div style="margin:0;padding:0;display:inline">
-      <input name="utf8" type="hidden" value="&#x2713;" /></div>
+      <input name="utf8" type="hidden" value="&#x2713;" />
+    </div>
     <%= hidden_field_tag :display, params[:display] %>
     <%= hidden_field_tag :filter, params[:filter] %>
 
@@ -18,43 +20,40 @@
     </div>
     <%= render :partial => 'search_form_extra_fields' %>
     <%= render :partial => 'catalog_filter' %>
+    <% end %>
+  </div>
 
-    <br />
+  <div id="catalog-display-options">
+    <div id="catalog-display-options-count">
+      <strong id="software-count"><%= "#{@software_count} Software(s)" %></strong>
+    </div>
 
-    <div id="catalog-display-options">
-      <div id="catalog-display-options-count">
-        <strong id="software-count"><%= "#{@software_count} Software(s)" %></strong>
+    <div id="catalog-display-options-show-and-sort">
+      <div id="catalog-display-options-show">
+        Show:
+        <%= select_tag("software_display",
+          options_for_select(['15', '30', '90', 'All'], :selected=>params[:display])
+          ) %>
       </div>
 
-      <div id="catalog-display-options-show-and-sort">
-        <div id="catalog-display-options-show">
-          Show:
-          <%= select_tag("software_display",
-            options_for_select(['15', '30', '90', 'All'], :selected=>params[:display])
-          ) %>
-        </div>
-
-        <div id="catalog-display-options-sort">
-          Sort by:
-          <%= select_tag("sort",
-            options_for_select(
-              [
-                [_("Name A-Z"), 'asc'],
-                [_("Name Z-A"), 'desc'],
-                [_("Relevance"), 'relevance']
+      <div id="catalog-display-options-sort">
+        Sort by:
+        <%= select_tag("sort",
+          options_for_select(
+            [
+              [_("Name A-Z"), 'asc'],
+              [_("Name Z-A"), 'desc'],
+              [_("Relevance"), 'relevance']
               ], :selected=>params[:sort])
-          ) %>
-        </div>
+              ) %>
       </div>
     </div>
-  <% end %>
+  </div>
+</div>
 
-  <% if @empty_query %>
-    <% hint = environment.search_hints[@asset] %>
-    <% if hint and !hint.blank? %>
-      <div class="search-hint"><%= hint %></div>
-    <% end %>
+<% if @empty_query %>
+  <% hint = environment.search_hints[@asset] %>
+  <% if hint and !hint.blank? %>
+    <div class="search-hint"><%= hint %></div>
   <% end %>
-
-  <div style="clear: both"></div>
-</div>
+<% end %>
--
libgit2 0.21.2