diff --git a/app/assets/stylesheets/steps.scss b/app/assets/stylesheets/steps.scss
index df9d1872f..42e3335cb 100644
--- a/app/assets/stylesheets/steps.scss
+++ b/app/assets/stylesheets/steps.scss
@@ -20,6 +20,16 @@
       }
     }
   }
+
+  .checklist-name-container,
+  .table-name-container {
+    align-items: center;
+    display: flex;
+
+    .remove-container {
+      padding-top: 10px;
+    }
+  }
 }
 
 #steps {
diff --git a/app/views/steps/_form_checklists.html.erb b/app/views/steps/_form_checklists.html.erb
index e30b1324b..abe957e14 100644
--- a/app/views/steps/_form_checklists.html.erb
+++ b/app/views/steps/_form_checklists.html.erb
@@ -1,20 +1,21 @@
 <div class="panel panel-default panel-step-attachment">
-  <div class="panel-heading">
-    <span class="fas fa-tasks"></span>
-    <%= t("protocols.steps.new.checklist_panel_title") %>
-    <div class="pull-right">
-      <%= ff.remove_nested_fields_link do %>
-        <span class="fas fa-times"></span>
-      <% end %>
-    </div>
-  </div>
   <div class="panel-body">
-    <%= ff.smart_text_area :name,
-                           label: t('protocols.steps.new.checklist_name'),
-                           class: 'checklist_name',
-                           autofocus: true,
-                           placeholder: t('protocols.steps.new.checklist_name_placeholder'),
-                           data: { 'atwho-edit' => '' } %>
+    <div class="row checklist-name-container">
+      <div class="col-xs-11">
+        <%= ff.smart_text_area :name,
+                               label: t('protocols.steps.new.checklist_name'),
+                               class: 'checklist_name',
+                               autofocus: true,
+                               single_line: true,
+                               placeholder: t('protocols.steps.new.checklist_name_placeholder'),
+                               data: { 'atwho-edit' => '' } %>
+      </div>
+      <div class="col-xs-1 remove-container">
+        <%= ff.remove_nested_fields_link do %>
+          <span class="fas fa-times"></span>
+        <% end %>
+      </div>
+    </div>
     <%= ff.label t("protocols.steps.new.checklist_items") %>
     <ul>
       <%= ff.nested_fields_for :checklist_items, ordered_checklist_items(ff.object) do |chkItems| %>
diff --git a/app/views/steps/_form_tables.html.erb b/app/views/steps/_form_tables.html.erb
index 57ad56ddb..8e7e89168 100644
--- a/app/views/steps/_form_tables.html.erb
+++ b/app/views/steps/_form_tables.html.erb
@@ -1,15 +1,20 @@
 <div class="panel panel-default panel-step-attachment">
-  <div class="panel-heading">
-    <span class="fas fa-table"></span>
-    <%= t("protocols.steps.new.table_panel_title") %>
-    <div class="pull-right">
-      <%= ff.remove_nested_fields_link do %>
-        <span class="fas fa-times"></span>
-      <% end %>
-    </div>
-  </div>
   <div class="panel-body">
-    <%= ff.smart_text_area :name, label: t("protocols.steps.new.table_name"), class: "table_name", autofocus: true, placeholder: t("protocols.steps.new.table_name_placeholder") %>
+    <div class="row table-name-container">
+      <div class="col-xs-11">
+        <%= ff.smart_text_area :name,
+                               label: t("protocols.steps.new.table_name"),
+                               class: "table_name",
+                               autofocus: true,
+                               single_line: true,
+                               placeholder: t("protocols.steps.new.table_name_placeholder") %>
+      </div>
+      <div class="col-xs-1 remove-container">
+        <%= ff.remove_nested_fields_link do %>
+          <span class="fas fa-times"></span>
+        <% end %>
+      </div>
+    </div>
     <div data-role="editable-table" class="panel-body">
       <%= ff.hidden_field(:contents, value: ff.object.contents_utf_8, class: "hot-contents" ) %>
       <div class="hot"></div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c87270817..509faf2d0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2136,14 +2136,12 @@ en:
         name_placeholder: "mRNA sequencing"
         description: "Description"
         description_placeholder: "Write what should be done here ..."
-        checklist_panel_title: "Checklist"
         checklist_name: "Checklist name"
         checklist_name_placeholder: "Checklist name"
         checklist_items: "Items"
         checklist_item_placeholder: "Task"
         checklist_add_item: "Add item"
         add_checklist: "Add checklist"
-        table_panel_title: "Table"
         table_name: "Table title"
         table_name_placeholder: "Table title"
         add_table: "Add table"