diff --git a/tailbone/forms/core.py b/tailbone/forms/core.py
index 857bfccf..7601fa26 100644
--- a/tailbone/forms/core.py
+++ b/tailbone/forms/core.py
@@ -1139,20 +1139,26 @@ class Form(object):
         if field_name not in self.fields:
             return ''
 
-        # TODO: fair bit of duplication here, should merge with deform.mako
         label = kwargs.get('label')
         if not label:
             label = self.get_label(field_name)
-        label = HTML.tag('label', label, for_=field_name)
-        field = self.render_field_value(field_name) or ''
-        field_div = HTML.tag('div', class_='field', c=[field])
-        contents = [label, field_div]
 
-        if self.has_helptext(field_name):
-            contents.append(HTML.tag('span', class_='instructions',
-                                     c=[self.render_helptext(field_name)]))
+        value = self.render_field_value(field_name) or ''
 
-        return HTML.tag('div', class_='field-wrapper {}'.format(field_name), c=contents)
+        if not self.request.use_oruga:
+
+            label = HTML.tag('label', label, for_=field_name)
+            field_div = HTML.tag('div', class_='field', c=[value])
+            contents = [label, field_div]
+
+            if self.has_helptext(field_name):
+                contents.append(HTML.tag('span', class_='instructions',
+                                         c=[self.render_helptext(field_name)]))
+
+            return HTML.tag('div', class_='field-wrapper {}'.format(field_name), c=contents)
+
+        # oruga uses <o-field>
+        return HTML.tag('o-field', label=label, c=[value], **{':horizontal': 'true'})
 
     def render_field_value(self, field_name):
         record = self.model_instance
diff --git a/tailbone/templates/receiving/view_row.mako b/tailbone/templates/receiving/view_row.mako
index 2341cd3e..efc1883a 100644
--- a/tailbone/templates/receiving/view_row.mako
+++ b/tailbone/templates/receiving/view_row.mako
@@ -60,8 +60,12 @@
     <nav class="panel">
       <p class="panel-heading">Product</p>
       <div class="panel-block">
-        <div style="display: flex;">
-          <div>
+        <div style="display: flex; gap: 1rem;">
+          <div style="flex-grow: 1;"
+             % if request.use_oruga:
+                 class="form-wrapper"
+             % endif
+            >
             ${form.render_field_readonly('item_entry')}
             % if row.product:
                 ${form.render_field_readonly(product_key_field)}
@@ -80,7 +84,7 @@
             ${form.render_field_readonly('catalog_unit_cost')}
           </div>
           % if image_url:
-              <div class="is-pulled-right">
+              <div>
                 ${h.image(image_url, "Product Image", width=150, height=150)}
               </div>
           % endif
@@ -429,7 +433,11 @@
         <nav class="panel" >
           <p class="panel-heading">Purchase Order</p>
           <div class="panel-block">
-            <div>
+            <div
+              % if request.use_oruga:
+                  class="form-wrapper"
+              % endif
+              >
               ${form.render_field_readonly('po_line_number')}
               ${form.render_field_readonly('po_unit_cost')}
               ${form.render_field_readonly('po_case_size')}
@@ -443,7 +451,11 @@
         <nav class="panel" >
           <p class="panel-heading">Invoice</p>
           <div class="panel-block">
-            <div>
+            <div
+              % if request.use_oruga:
+                  class="form-wrapper"
+              % endif
+              >
               ${form.render_field_readonly('invoice_number')}
               ${form.render_field_readonly('invoice_line_number')}
               ${form.render_field_readonly('invoice_unit_cost')}
diff --git a/tailbone/templates/themes/butterball/base.mako b/tailbone/templates/themes/butterball/base.mako
index 439cf81a..4b6c03f8 100644
--- a/tailbone/templates/themes/butterball/base.mako
+++ b/tailbone/templates/themes/butterball/base.mako
@@ -243,7 +243,7 @@
     }
 
     /* .form-wrapper .form .field.is-horizontal .field-label .label, */
-    .form-wrapper .form .field.is-horizontal .field-label {
+    .form-wrapper .field.is-horizontal .field-label {
         text-align: left;
         white-space: nowrap;
         min-width: 18em;
diff --git a/tailbone/views/purchasing/batch.py b/tailbone/views/purchasing/batch.py
index cd369f0a..1d11130c 100644
--- a/tailbone/views/purchasing/batch.py
+++ b/tailbone/views/purchasing/batch.py
@@ -794,6 +794,7 @@ class PurchasingBatchView(BatchMasterView):
 
         g = factory(
             key='{}.row_credits'.format(route_prefix),
+            request=self.request,
             data=[],
             columns=[
                 'credit_type',