diff --git a/web/app/views/clients/_musicians.html.erb b/web/app/views/clients/_musicians.html.erb
index d660a363e..2fad4a25b 100644
--- a/web/app/views/clients/_musicians.html.erb
+++ b/web/app/views/clients/_musicians.html.erb
@@ -1,26 +1,19 @@
 <!-- Musician Screen -->
-<div layout="screen" layout-id="musicians" class="screen secondary">
-  <div class="content">
-    <div class="content-head">
-      <div class="content-icon">
-        <%= image_tag "content/icon_musicians.png", {:height => 19, :width => 19} %>
-      </div>
-
-      <h1>musicians</h1>
+<%= content_tag(:div, :layout => 'screen', 'layout-id' => 'musicians', :class => "screen secondary") do -%>
+  <%= content_tag(:div, :class => :content) do -%>
+    <%= content_tag(:div, :class => 'content-head') do -%>
+      <%= content_tag(:div, image_tag("content/icon_musicians.png", {:height => 19, :width => 19}), :class => 'content-icon') %>
+      <%= content_tag(:h1, 'musicians') %>
       <%= render "screen_navigation" %>
-    </div>
-    <form id="find-musician-form">
-      <div class="musician-filter" id="session-controls">
-	<%= render :partial => "musician_filter" %>
-      </div>
-      <div class="content-scroller">
-        <div class="content-wrapper musician-wrapper">
-          <div id="musician-filter-results"></div>
-        </div>
-      </div>
-    </form>
-  </div>
-</div>
+    <% end -%>
+    <%= form_tag('', :id => 'find-musician-form') do -%>
+      <%= content_tag(:div, render(:partial => "musician_filter"), :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') %>
+      <% end -%>
+    <% end -%>
+  <% end -%>
+<% end -%>
 
 <!-- Session Row Template -->
 <script type="text/template" id="template-find-musician-row">