diff --git a/web/app/views/clients/_musician_filter.html.erb b/web/app/views/clients/_musician_filter.html.erb
index 633d9bfc2..4a351876e 100644
--- a/web/app/views/clients/_musician_filter.html.erb
+++ b/web/app/views/clients/_musician_filter.html.erb
@@ -1,28 +1,35 @@
-<div style="min-width:770px;">
-  <div class="filter-element">
-    <div class="filter-element" style="padding-top:3px;">Filter By:</div>
+<%= content_tag(:div, :style => "min-width:770px;") do -%>
+  <%= content_tag(:div, :class => 'filter-element') do -%>
+    <%= content_tag(:div, 'Filter By:', :class => 'filter-element', :style => "padding-top:3px;") %>
     <!-- order by filter -->
     <%= select_tag(:musician_order_by, options_for_select(Search::M_ORDERINGS), {:class => 'musician-order-by'} ) %>
-  </div>
-  <div class="filter-element">
+  <% end -%>
+  <%= content_tag(:div, :class => 'filter-element') do -%>
     <!-- instrument filter -->
-    <div class="filter-element" style="">Instrument:</div>
-    <div id="find-musician-instrument" class="filter-element">
+    <%= content_tag(:div, 'Instrument:', :class => 'filter-element') %>
+    <%= content_tag(:div, :class => 'filter-element', :id => "find-musician-instrument") do -%>
       <%= select_tag(:instrument, 
 	  options_for_select([['Any', '']].concat(JamRuby::Instrument.all.collect { |ii| [ii.description, ii.id] })), 
 	  {:class => 'instrument-list'} ) %>
-    </div>
-  </div>
+    <% end -%>
+  <% end -%>
   <!-- distance filter -->
-  <div class="filter-element">
-    <div class="filter-element">Within</div>
-    <div class="query-distance-params" style="height:25px; ">
-      <input id="musician_query_distance" type="text" name="query_distance" value="500" placeholder="500" />
-    </div>
-    <div class="filter-element">miles of <span id="musician-filter-city"><%= current_user.current_city(request.remote_ip) %></span></div>
-  </div>
-  <div class="right mr10">
-    <a id="btn-refresh-musicians" style="text-decoration:none;" class="button-grey">REFRESH</a>
-  </div>
-
-</div>
+  <%= content_tag(:div, :class => 'filter-element') do -%>
+    <%= content_tag(:div, 'Within', :class => 'filter-element') %>
+    <%= content_tag(:div, :class => 'query-distance-params', :style => "height:25px;") do -%>
+      <%= text_field_tag(:query_distance, 
+	  Search::M_MILES_DEFAULT.to_s, 
+	  :id => :musician_query_distance, 
+          :placeholder => Search::M_MILES_DEFAULT.to_s) %>
+    <% end -%>
+    <%= content_tag(:div, :class => 'filter-element') do -%>
+      miles of <%= content_tag(:span, current_user.current_city(request.remote_ip), :id => 'musician-filter-city') %>
+    <% end -%>
+  <% end -%>
+  <%= content_tag(:div, 
+      link_to('REFRESH', '#', 
+        :id => 'btn-refresh-musicians', 
+        :style => 'text-decoration:none', 
+        :class => 'button-grey'), 
+      :class => 'right mr10') %>
+<% end -%>