diff --git a/adit/batch_query/forms.py b/adit/batch_query/forms.py
index ff7c952a..e6e8f9ee 100644
--- a/adit/batch_query/forms.py
+++ b/adit/batch_query/forms.py
@@ -1,5 +1,5 @@
 from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Submit
+from crispy_forms.layout import Layout, Submit
 from django import forms
 from django.conf import settings
 from django.core.exceptions import ValidationError
@@ -71,6 +71,8 @@ def __init__(self, *args, **kwargs):
         ] = "onSendFinishedMailChange($event)"
 
         self.helper = FormHelper(self)
+        self.helper.layout = Layout("source")  # Make sure source is on top
+        self.helper.render_unmentioned_fields = True  # and the rest of the fields below
         self.helper.attrs["x-data"] = "batchQueryJobForm()"
         self.helper.add_input(Submit("save", "Create Job"))
 
diff --git a/adit/batch_transfer/forms.py b/adit/batch_transfer/forms.py
index c2fe3622..4d72f36f 100644
--- a/adit/batch_transfer/forms.py
+++ b/adit/batch_transfer/forms.py
@@ -1,5 +1,5 @@
 from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Submit
+from crispy_forms.layout import Layout, Submit
 from django import forms
 from django.conf import settings
 from django.core.exceptions import ValidationError
@@ -98,6 +98,8 @@ def __init__(self, *args, **kwargs):
         ] = "onSendFinishedMailChange($event)"
 
         self.helper = FormHelper(self)
+        self.helper.layout = Layout("source", "destination")  # Make sure those fields are on top
+        self.helper.render_unmentioned_fields = True  # and the rest of the fields below
         self.helper.attrs["x-data"] = "batchTransferJobForm()"
         self.helper.add_input(Submit("save", "Create Job"))