diff --git a/customers/forms.py b/customers/forms.py
index f5594fd..3108991 100644
--- a/customers/forms.py
+++ b/customers/forms.py
@@ -19,15 +19,13 @@ class CustomerForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super(CustomerForm, self).__init__(*args, **kwargs)
 
-        self.helper = FormHelper()
+        self.helper = FormHelper(self)
         self.helper.attrs = {
             'hx-post': reverse_lazy('customer_create'),
             'id': 'customer-form',
         }
-        self.helper.layout = Layout(
+        self.helper.layout.append(
             FormActions(
-                Field('name'),
-                Field('description'),
                 Submit('save', 'Save'),
                 Button('cancel', 'Cancel', css_class="btn btn-secondary",
                        onclick="closeModal()")
diff --git a/devices/forms.py b/devices/forms.py
index e9560e0..4b08c7d 100644
--- a/devices/forms.py
+++ b/devices/forms.py
@@ -27,13 +27,12 @@ class DeviceCategoryForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super(DeviceCategoryForm, self).__init__(*args, **kwargs)
 
-        self.helper = FormHelper()
+        self.helper = FormHelper(self)
         self.helper.attrs = {
             'hx-post': reverse_lazy('device_category_create'),
             'id': 'device-category-form',
         }
-        self.helper.layout = Layout(
-            Field('name'),
+        self.helper.layout.append(
             FormActions(
                 Submit('save_category', 'Save'),
                 Button('cancel', 'Cancel', css_class="btn btn-secondary",