diff --git a/web/app/assets/stylesheets/client/band.css.scss b/web/app/assets/stylesheets/client/band.css.scss
index 63152401a..814fed92f 100644
--- a/web/app/assets/stylesheets/client/band.css.scss
+++ b/web/app/assets/stylesheets/client/band.css.scss
@@ -273,9 +273,6 @@
 
 #band-filter-results {
   margin: 0 10px 5px 10px;
-  overflow: auto; 
-  height: 100%;
-  width:  100%;
 }
 
 .band-list-result {
diff --git a/web/app/assets/stylesheets/client/content.css.scss b/web/app/assets/stylesheets/client/content.css.scss
index 168845843..ae75f3fc7 100644
--- a/web/app/assets/stylesheets/client/content.css.scss
+++ b/web/app/assets/stylesheets/client/content.css.scss
@@ -88,6 +88,17 @@
             }
         }
     }
+
+    .filter-head {
+        position: absolute;
+        padding:11px 0;
+    }
+    .filter-body {
+        height:100%;
+        width:100%;
+        box-sizing: border-box;
+        padding-top: 54px;
+    }
 }
 
 .result-list-button-wrapper {
diff --git a/web/app/assets/stylesheets/client/musician.css.scss b/web/app/assets/stylesheets/client/musician.css.scss
index fc78eefa3..b9e47e290 100644
--- a/web/app/assets/stylesheets/client/musician.css.scss
+++ b/web/app/assets/stylesheets/client/musician.css.scss
@@ -22,14 +22,11 @@
 
 #musician-filter-results {
   margin: 0 10px 0px 10px;
-  overflow: auto; 
-  height: 100%;
-//  width:  100%;
 }
 
 .musician-wrapper {
-//  overflow: auto;
-//  height: 480px;
+  overflow: initial;
+  height: initial;
   width:  100%;
 }
 
@@ -37,12 +34,8 @@
   padding-top: 5px;
   padding-right: 5px;
   padding-left: 5px;
-  box-sizing:border-box;
 }
 
-#session-controls.musician-filter {
-    padding-top: 6px;
-}
 .musician-following {
   overflow: auto;
 }
diff --git a/web/app/assets/stylesheets/client/profile.css.scss b/web/app/assets/stylesheets/client/profile.css.scss
index ef0a772dd..f2ec34e60 100644
--- a/web/app/assets/stylesheets/client/profile.css.scss
+++ b/web/app/assets/stylesheets/client/profile.css.scss
@@ -196,6 +196,7 @@
     position:relative;
     margin:10px 0px 10px 0px;
     padding-bottom:5px;
+    box-sizing:border-box;
 }
 
 .profile-social-left {
diff --git a/web/app/assets/stylesheets/client/screen_common.css.scss b/web/app/assets/stylesheets/client/screen_common.css.scss
index 0edcc5c43..98fd15a4b 100644
--- a/web/app/assets/stylesheets/client/screen_common.css.scss
+++ b/web/app/assets/stylesheets/client/screen_common.css.scss
@@ -42,7 +42,8 @@
     }
 }
 
-.content {
+.content,
+.inner-content {
     clear: both;
     float: left;
     height: 100%;
diff --git a/web/app/views/clients/_bands.html.erb b/web/app/views/clients/_bands.html.erb
index 6e82eb331..2dc713b39 100644
--- a/web/app/views/clients/_bands.html.erb
+++ b/web/app/views/clients/_bands.html.erb
@@ -7,11 +7,11 @@
       <%= render "screen_navigation" %>
     <% end -%>
     <%= content_tag(:div, :class => 'content-body') do -%>
-      <%= content_tag(:div, :class => 'content-body-scroller') do -%>
-        <%= form_tag('', :id => 'find-band-form') do -%>
-          <%= content_tag(:div, render(:partial => "web_filter", :locals => {:search_type => Search::PARAM_BAND}), :class => 'band-filter', :id => 'session-controls') %>
-          <%= content_tag(:div, :class => 'content-scroller') do -%>
-            <%= content_tag(:div, content_tag(:div, '', :id => 'band-filter-results', :class => 'filter-results'), :class => 'content-wrapper band-wrapper') %>
+      <%= form_tag('', {:id => 'find-band-form', :class => 'inner-content'}) do -%>
+        <%= render(:partial => "web_filter", :locals => {:search_type => Search::PARAM_BAND}) %>
+        <%= content_tag(:div, :class => 'filter-body') do %>
+          <%= content_tag(:div, :class => 'content-body-scroller') do -%>
+            <%= content_tag(:div, content_tag(:div, '', :id => 'band-filter-results', :class => 'filter-results'), :class => 'content-wrapper') %>
           <% end -%>
         <% end -%>
       <% end -%>
diff --git a/web/app/views/clients/_musicians.html.erb b/web/app/views/clients/_musicians.html.erb
index 115aba151..0df6f6e06 100644
--- a/web/app/views/clients/_musicians.html.erb
+++ b/web/app/views/clients/_musicians.html.erb
@@ -7,11 +7,11 @@
       <%= render "screen_navigation" %>
     <% end -%>
     <%= content_tag(:div, :class => 'content-body') do -%>
-      <%= content_tag(:div, :class => 'content-body-scroller') do -%>
-        <%= form_tag('', :id => 'find-musician-form') do -%>
-          <%= content_tag(:div, render(:partial => "web_filter", :locals => {:search_type => Search::PARAM_MUSICIAN}), :class => 'musician-filter', :id => 'session-controls') %>
-          <%= content_tag(:div, :class => 'content-scroller') do -%>
-            <%= content_tag(:div, content_tag(:div, '', :id => 'musician-filter-results'), :class => 'content-wrapper musician-wrapper') %>
+      <%= form_tag('', {:id => 'find-musician-form', :class => 'inner-content'}) do -%>
+        <%= render(:partial => "web_filter", :locals => {:search_type => Search::PARAM_MUSICIAN}) %>
+        <%= content_tag(:div, :class => 'filter-body') do %>
+          <%= content_tag(:div, :class => 'content-body-scroller') do -%>
+            <%= content_tag(:div, content_tag(:div, '', :id => 'musician-filter-results', :class => 'filter-results'), :class => 'content-wrapper musician-wrapper') %>
           <% end -%>
         <% end -%>
       <% end -%>
@@ -22,7 +22,7 @@
 <!-- Session Row Template -->
 <script type="text/template" id="template-find-musician-row">
   <div class="profile-band-list-result musician-list-result">
-    <div style="float:left">
+    <div class="left">
       <!-- avatar -->
       <div class="avatar-small"><img src="{avatar_url}" /></div>
       
diff --git a/web/app/views/clients/_web_filter.html.erb b/web/app/views/clients/_web_filter.html.erb
index ae0be5889..cfad92687 100644
--- a/web/app/views/clients/_web_filter.html.erb
+++ b/web/app/views/clients/_web_filter.html.erb
@@ -1,30 +1,39 @@
-<% filter_label = defined?(search_type) && search_type == Search::PARAM_BAND ? :band : :musician %>
-<%= content_tag(:div, :class => "filter-element wrapper") do -%>
-  <%= content_tag(:div, 'Filter By:', :class => 'filter-element desc') %>
-  <!-- order by filter -->
-  <%= select_tag("#{filter_label}_order_by", options_for_select(Search::ORDERINGS), {:class => "#{filter_label}-order-by"} ) %>
-<% end -%>
-<%= content_tag(:div, :class => 'filter-element wrapper') do -%>
-  <% if :musician == filter_label %>
-    <!-- instrument filter -->
-    <%= content_tag(:div, 'Instrument:', :class => 'filter-element desc') %>
-    <%= select_tag("#{filter_label}_instrument",
-      options_for_select([['Any', '']].concat(JamRuby::Instrument.all.collect { |ii| [ii.description, ii.id] }))) %>
-  <% elsif :band == filter_label %>
-    <!-- genre filter -->
-    <%= content_tag(:div, 'Genre:', :class => 'filter-element desc') %>
-    <%= select_tag("#{filter_label}_genre",
-      options_for_select([['Any', '']].concat(JamRuby::Genre.all.collect { |ii| [ii.description, ii.id] }))) %>
-  <% end %>
-<% end -%>
-<!-- distance filter -->
-<%= content_tag(:div, :class => 'filter-element wrapper') do -%>
-  <%= content_tag(:div, 'Within', :class => 'filter-element desc') %>
-  <%= content_tag(:div, :class => 'query-distance-params') do -%>
-    <% default_distance = :musician == filter_label ? Search::M_MILES_DEFAULT : Search::B_MILES_DEFAULT  %>
-    <%= select_tag("#{filter_label}_query_distance", options_for_select(Search::DISTANCE_OPTS, default_distance)) %>
+<!-- @begin web_filter -->
+<%  case search_type
+    when Search::PARAM_BAND
+      filter_label = :band
+    when Search::PARAM_MUSICIAN
+      filter_label = :musician
+    end %>
+<%= content_tag(:div, :id => defined?(id) ? id : 'session-controls', :class => "#{filter_label}-filter filter-head") do %>
+  <%= content_tag(:div, :class => "filter-element wrapper") do -%>
+    <%= content_tag(:div, 'Filter By:', :class => 'filter-element desc') %>
+    <!-- order by filter -->
+    <%= select_tag("#{filter_label}_order_by", options_for_select(Search::ORDERINGS), {:class => "#{filter_label}-order-by"} ) %>
   <% end -%>
-  <%= content_tag(:div, :class => 'filter-element desc') do -%>
-    miles of <%= content_tag(:span, current_user.current_city(request.remote_ip), :id => "#{filter_label}-filter-city") %>
+  <%= content_tag(:div, :class => 'filter-element wrapper') do -%>
+    <% if :musician == filter_label %>
+      <!-- instrument filter -->
+      <%= content_tag(:div, 'Instrument:', :class => 'filter-element desc') %>
+      <%= select_tag("#{filter_label}_instrument",
+        options_for_select([['Any', '']].concat(JamRuby::Instrument.all.collect { |ii| [ii.description, ii.id] }))) %>
+    <% elsif :band == filter_label %>
+      <!-- genre filter -->
+      <%= content_tag(:div, 'Genre:', :class => 'filter-element desc') %>
+      <%= select_tag("#{filter_label}_genre",
+        options_for_select([['Any', '']].concat(JamRuby::Genre.all.collect { |ii| [ii.description, ii.id] }))) %>
+    <% end %>
+  <% end -%>
+  <!-- distance filter -->
+  <%= content_tag(:div, :class => 'filter-element wrapper') do -%>
+    <%= content_tag(:div, 'Within', :class => 'filter-element desc') %>
+    <%= content_tag(:div, :class => 'query-distance-params') do -%>
+      <% default_distance = :musician == filter_label ? Search::M_MILES_DEFAULT : Search::B_MILES_DEFAULT  %>
+      <%= select_tag("#{filter_label}_query_distance", options_for_select(Search::DISTANCE_OPTS, default_distance)) %>
+    <% end -%>
+    <%= content_tag(:div, :class => 'filter-element desc') do -%>
+      miles of <%= content_tag(:span, current_user.current_city(request.remote_ip), :id => "#{filter_label}-filter-city") %>
+    <% end -%>
   <% end -%>
 <% end -%>
+<!-- @end   web_filter -->
\ No newline at end of file