diff --git a/tailbone/templates/batch/importer/view_row.mako b/tailbone/templates/batch/importer/view_row.mako
index 55efb6d1..24eb6456 100644
--- a/tailbone/templates/batch/importer/view_row.mako
+++ b/tailbone/templates/batch/importer/view_row.mako
@@ -7,8 +7,7 @@
   % endif
 </%def>
 
-${parent.body()}
-
+<%def name="field_diff_table()">
 % if instance.status_code == enum.IMPORTER_BATCH_ROW_STATUS_CREATE:
     <table class="diff monospace new">
       <thead>
@@ -67,3 +66,22 @@ ${parent.body()}
       </tbody>
     </table>
 % endif
+</%def>
+
+<%def name="render_buefy_form()">
+  <div class="form">
+    <tailbone-form></tailbone-form>
+    <br />
+    ${self.field_diff_table()}
+  </div>
+</%def>
+
+<%def name="render_form()">
+  ${parent.render_form()}
+  % if not use_buefy:
+      ${self.field_diff_table()}
+  % endif
+</%def>
+
+
+${parent.body()}