diff --git a/device/forms.py b/device/forms.py
index b6c1d21..21c9a9a 100644
--- a/device/forms.py
+++ b/device/forms.py
@@ -23,7 +23,7 @@ DEVICE_TYPES = [
 class DeviceForm(forms.Form):
     type = forms.ChoiceField(choices = DEVICE_TYPES, required=False)
     amount = forms.IntegerField(required=False, initial=1)
-    customer_id = forms.CharField(required=False)
+    custom_id = forms.CharField(required=False)
     name = forms.CharField(required=False)
     value = forms.CharField(required=False)
 
@@ -49,8 +49,8 @@ class BaseDeviceFormSet(forms.BaseFormSet):
                 row["amount"] = d["amount"]
             if d.get("name"):
                 row[d["name"]] = d.get("value", '')
-            if d.get("customer_id"):
-                row['CUSTOMER_ID']= d["customer_id"]
+            if d.get("custom_id"):
+                row['CUSTOM_ID']= d["custom_id"]
 
         doc = create_doc(row)
         if not commit:
diff --git a/device/templates/new_device.html b/device/templates/new_device.html
index bdb2911..320790d 100644
--- a/device/templates/new_device.html
+++ b/device/templates/new_device.html
@@ -40,15 +40,6 @@
   {% endif %}
   {{ form.management_form }}
   <div class="container" id="formset-container">
-    <div class="row mb-2">
-      <div class="col"></div>
-      <div class="col-2 text-center">
-        <a href="javascript:void()" onclick="addForm(this);" type="button" class="btn btn-green-admin">
-          <i class="bi bi-plus"></i>
-          {% trans 'Add' %}
-        </a>
-      </div>
-    </div>
     <div class="row mb-2">
       <div class="col">
         {% bootstrap_field form.0.type %}
@@ -61,7 +52,18 @@
     </div>
     <div class="row mb-2">
       <div class="col">
-        {% bootstrap_field form.0.customer_id %}
+        {% bootstrap_field form.0.custom_id %}
+      </div>
+    </div>
+    <div class="row mb-2">
+      <div class="col-10">
+        <span class="fw-bold">{% trans 'Component details' %}</span>
+      </div>
+      <div class="col-2 text-center">
+        <a href="javascript:void()" onclick="addForm(this);" type="button" class="btn btn-green-admin text-nowrap">
+          <i class="bi bi-plus"></i>
+          {% trans 'Add component' %}
+        </a>
       </div>
     </div>
     {% for f in form %}
diff --git a/device/views.py b/device/views.py
index 8d4c024..60412de 100644
--- a/device/views.py
+++ b/device/views.py
@@ -21,7 +21,7 @@ class NewDeviceView(DashboardView, FormView):
     template_name = "new_device.html"
     title = _("New Device")
     breadcrumb = "Device / New Device"
-    success_url = reverse_lazy('device:add')
+    success_url = reverse_lazy('dashboard:unassigned_devices')
     form_class = DeviceFormSet
 
     def form_valid(self, form):