diff --git a/templates/display_base.mako b/templates/display_base.mako
index 3d2003998ef..853c5a9d2dc 100644
--- a/templates/display_base.mako
+++ b/templates/display_base.mako
@@ -79,7 +79,7 @@
 </%def>
 
 <%def name="render_item_header( item )">
-    <h3>Galaxy ${get_class_display_name( item.__class__ )} '${get_item_name( item )| h}'</h3>
+    <h3>${get_item_name( item )| h}</h3>
     %if hasattr( item, "annotation") and item.annotation is not None:
         <div class="annotation">Annotation: ${item.annotation}</div>
     %endif
@@ -115,7 +115,7 @@
         href_to_user_items = h.url_for( controller='/' + modern_route, action='list_published', xxx=item.user.username)
         href_to_user_items = href_to_user_items.replace( 'xxx', 'f-username')
     %>
-    <div class="page-body p-2">
+    <div class="page-body p-3">
         <div>
             ${self.render_item_header( item )}
         </div>
diff --git a/templates/webapps/galaxy/workflow/display.mako b/templates/webapps/galaxy/workflow/display.mako
index 4c01992b98d..476144e6675 100644
--- a/templates/webapps/galaxy/workflow/display.mako
+++ b/templates/webapps/galaxy/workflow/display.mako
@@ -14,13 +14,13 @@
 <%def name="do_inputs( inputs, values, prefix, step, other_values=None )">
   %for input_index, input in enumerate( inputs.values() ):
     %if input.type == "repeat":
-      <div class="repeat-group">
-          <div class="form-title-row"><b>${input.title_plural}</b></div>
+      <div>
+          <div class="form-row"><b>${input.title_plural}</b></div>
           <% repeat_values = values[input.name] %>
           %for i in range( len( repeat_values ) ):
-            <div class="repeat-group-item">
+            <div class="ui-portlet-section ml-2">
                 <% index = repeat_values[i]['__index__'] %>
-                <div class="form-title-row"><b>${input.title} ${i + 1}</b></div>
+                <div class="form-row"><b>${input.title} ${i + 1}</b></div>
                 ${do_inputs( input.inputs, repeat_values[ i ], prefix + input.name + "_" + str(index) + "|", step, other_values )}
             </div> 
           %endfor
@@ -34,9 +34,9 @@
     %elif input.type == "section":
       <% new_prefix = prefix + input.name + "|" %>
       <% group_values = values[input.name] %>
-      <div class="form-title-row"><b>${input.title}:</b></div>
-      <div class="repeat-group">
-        <div class="repeat-group-item">
+      <div class="form-row"><b>${input.title}:</b></div>
+      <div>
+        <div class="ui-portlet-section ml-2">
           ${do_inputs( input.inputs, group_values, new_prefix, step, other_values )}
         </div>
       </div>
@@ -100,22 +100,22 @@
               <% 
                 tool = trans.app.toolbox.get_tool( step.tool_id )
               %>
-              <div class="toolForm">
+              <div class="card mt-3 mr-3">
                 %if tool:
-                  <div class="toolFormTitle">Step ${int(step.order_index)+1}: ${tool.name | h}</div>
-                  <div class="toolFormBody">
+                  <div class="card-header">Step ${int(step.order_index)+1}: ${tool.name | h}</div>
+                  <div class="card-body">
                     ${do_inputs( tool.inputs, step.state.inputs, "", step )}
                   </div>
                 %else:
-                  <div class="toolFormTitle">Step ${int(step.order_index)+1}: Unknown Tool with id '${step.tool_id | h}'</div>
+                  <div class="card-header">Step ${int(step.order_index)+1}: Unknown Tool with id '${step.tool_id | h}'</div>
                 %endif
               </div>
             %else:
             ## TODO: always input dataset?
             <% module = step.module %>
-              <div class="toolForm">
-                  <div class="toolFormTitle">Step ${int(step.order_index)+1}: ${module.name | h}</div>
-                  <div class="toolFormBody">
+              <div class="card mt-3 mr-3">
+                  <div class="card-header">Step ${int(step.order_index)+1}: ${module.name | h}</div>
+                  <div class="card-body">
                     ${do_inputs( module.get_runtime_inputs(), step.state.inputs, "", step )}
                   </div>
               </div>