diff --git a/src/Services/ImportExportSystem/BOMImporter.php b/src/Services/ImportExportSystem/BOMImporter.php
index 7facb56a..729f10c4 100644
--- a/src/Services/ImportExportSystem/BOMImporter.php
+++ b/src/Services/ImportExportSystem/BOMImporter.php
@@ -858,7 +858,7 @@ class BOMImporter
         if (isset($entry['name'])) {
             $givenName = trim($entry['name']) === '' ? null : trim ($entry['name']);
 
-            if ($givenName !== null && $bomEntry->getPart() !== null && $bomEntry->getPart()->getName() !== $givenName) {
+            if ($givenName !== null && $part !== null && $part->getName() !== $givenName) {
                 //Apply different names for parts list entry
                 $bomEntry->setName(trim($entry['name']) === '' ? null : trim ($entry['name']));
             }
diff --git a/templates/assemblies/info/info.html.twig b/templates/assemblies/info/info.html.twig
index 636b6d7e..6b6a4c89 100644
--- a/templates/assemblies/info/info.html.twig
+++ b/templates/assemblies/info/info.html.twig
@@ -70,16 +70,6 @@
                 {% trans %}assembly.info.info.label{% endtrans %}
             </button>
         </li>
-        {% if assembly.children is not empty %}
-            <li class="nav-item" role="presentation">
-                <button class="nav-link" id="subassemblies-tab" data-bs-toggle="tab" data-bs-target="#subassemblies-tab-pane"
-                        type="button" role="tab" aria-controls="subassemblies-tab-pane" aria-selected="false">
-                    <i class="fa-solid fa-folder-tree fa-fw"></i>
-                    {% trans %}assembly.info.sub_assemblies.label{% endtrans %}
-                    <span class="badge bg-secondary">{{ assembly.children | length }}</span>
-                </button>
-            </li>
-        {% endif %}
         <li class="nav-item" role="presentation">
             <button class="nav-link" id="bom-tab" data-bs-toggle="tab" data-bs-target="#part-tab-pane"
                     type="button" role="tab" aria-controls="part-tab-pane" aria-selected="false">
@@ -116,13 +106,8 @@
         </div>
         <div class="tab-pane fade" id="part-tab-pane" role="tabpanel" aria-labelledby="part-tab" tabindex="0">
             {% include "assemblies/info/_part.html.twig" %}
-        {% if assembly.children is not empty %}
-            <div class="tab-pane fade" id="subassemblies-tab-pane" role="tabpanel" aria-labelledby="bom-tab" tabindex="0">
-                {% include "assemblies/info/_subassemblies.html.twig" %}
-            </div>
-        {% endif %}
         <div class="tab-pane fade" id="bom-tab-pane" role="tabpanel" aria-labelledby="bom-tab" tabindex="0">
-            {% include "assemblies/info/_bom.html.twig" %}
+            {% include "assemblies/info/_part.html.twig" %}
         </div>
         <div class="tab-pane fade" id="attachments-tab-pane" role="tabpanel" aria-labelledby="attachments-tab" tabindex="0">
             {% include "assemblies/info/_attachments_info.html.twig" with {"assembly": assembly} %}