diff --git a/InvenTree/locale/de/LC_MESSAGES/django.po b/InvenTree/locale/de/LC_MESSAGES/django.po
index ddcc0cd368..fa6438832b 100644
--- a/InvenTree/locale/de/LC_MESSAGES/django.po
+++ b/InvenTree/locale/de/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-09 05:10+0000\n"
+"POT-Creation-Date: 2021-07-09 06:58+0000\n"
 "PO-Revision-Date: 2021-07-09 05:50\n"
 "Last-Translator: \n"
 "Language-Team: German\n"
@@ -603,8 +603,8 @@ msgstr "Bauauftrag"
 #: build/models.py:110 build/templates/build/index.html:8
 #: build/templates/build/index.html:15 order/templates/order/so_builds.html:12
 #: order/templates/order/so_navbar.html:19
-#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:58
-#: part/templates/part/navbar.html:61 templates/InvenTree/index.html:191
+#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:52
+#: part/templates/part/navbar.html:55 templates/InvenTree/index.html:191
 #: templates/InvenTree/search.html:185
 #: templates/InvenTree/settings/tabs.html:34 users/models.py:44
 msgid "Build Orders"
@@ -783,7 +783,7 @@ msgstr "Link zu einer externen URL"
 #: order/templates/order/sales_order_detail.html:319
 #: order/templates/order/so_navbar.html:33
 #: order/templates/order/so_navbar.html:36 part/models.py:864
-#: part/templates/part/navbar.html:133
+#: part/templates/part/navbar.html:121
 #: report/templates/report/inventree_build_order_base.html:173
 #: stock/forms.py:140 stock/forms.py:284 stock/forms.py:316 stock/forms.py:344
 #: stock/models.py:536 stock/models.py:1678 stock/models.py:1784
@@ -935,8 +935,8 @@ msgstr "Seriennummer"
 #: build/templates/build/attachments.html:12
 #: build/templates/build/navbar.html:43 build/templates/build/navbar.html:46
 #: order/templates/order/po_navbar.html:35
-#: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:124
-#: part/templates/part/navbar.html:127 stock/templates/stock/navbar.html:47
+#: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:112
+#: part/templates/part/navbar.html:115 stock/templates/stock/navbar.html:47
 #: stock/templates/stock/navbar.html:50
 msgid "Attachments"
 msgstr "Anhänge"
@@ -2286,7 +2286,7 @@ msgid "Create new manufacturer part"
 msgstr "Neues Herstellerteil anlegen"
 
 #: company/templates/company/detail_manufacturer_part.html:23
-#: part/templates/part/manufacturer.html:19
+#: part/templates/part/supplier.html:47
 msgid "New Manufacturer Part"
 msgstr "Neues Herstellerteil"
 
@@ -2294,9 +2294,8 @@ msgstr "Neues Herstellerteil"
 #: company/templates/company/detail_supplier_part.html:27
 #: company/templates/company/manufacturer_part_suppliers.html:20
 #: company/templates/company/manufacturer_part_suppliers.html:46
-#: part/templates/part/category.html:131
-#: part/templates/part/manufacturer.html:22
-#: part/templates/part/supplier.html:20
+#: part/templates/part/category.html:131 part/templates/part/supplier.html:21
+#: part/templates/part/supplier.html:50
 msgid "Options"
 msgstr "Optionen"
 
@@ -2329,8 +2328,8 @@ msgid "Create new Part"
 msgstr "Neues Teil hinzufügen"
 
 #: company/templates/company/detail_manufacturer_part.html:74
-#: company/views.py:66 part/templates/part/manufacturer.html:52
-#: part/templates/part/supplier.html:55
+#: company/views.py:66 part/templates/part/supplier.html:85
+#: part/templates/part/supplier.html:161
 msgid "New Manufacturer"
 msgstr "Neuer Hersteller"
 
@@ -2363,14 +2362,14 @@ msgstr "Neues Zuliefererteil anlegen"
 
 #: company/templates/company/detail_supplier_part.html:22
 #: company/templates/company/manufacturer_part_suppliers.html:17
-#: part/templates/part/part_base.html:432 part/templates/part/supplier.html:17
+#: part/templates/part/part_base.html:432 part/templates/part/supplier.html:18
 #: templates/js/stock.js:1341
 msgid "New Supplier Part"
 msgstr "Neues Zuliefererteil"
 
 #: company/templates/company/detail_supplier_part.html:72
 #: company/templates/company/manufacturer_part_suppliers.html:96
-#: company/views.py:60 part/templates/part/supplier.html:50
+#: company/views.py:60 part/templates/part/supplier.html:80
 msgid "New Supplier"
 msgstr "Neuer Zulieferer"
 
@@ -2419,8 +2418,8 @@ msgstr "Herstellerteil löschen"
 
 #: company/templates/company/manufacturer_part_navbar.html:14
 #: company/templates/company/manufacturer_part_suppliers.html:10
-#: company/views.py:59 part/templates/part/navbar.html:87
-#: part/templates/part/navbar.html:90 part/templates/part/prices.html:153
+#: company/views.py:59 part/templates/part/navbar.html:75
+#: part/templates/part/navbar.html:78 part/templates/part/prices.html:153
 #: templates/InvenTree/search.html:316 templates/navbar.html:35
 msgid "Suppliers"
 msgstr "Zulieferer"
@@ -2432,7 +2431,7 @@ msgstr "Herstellerteil-Bestand"
 #: company/templates/company/manufacturer_part_navbar.html:22
 #: company/templates/company/navbar.html:41
 #: company/templates/company/supplier_part_navbar.html:15
-#: part/templates/part/navbar.html:39 stock/api.py:53
+#: part/templates/part/navbar.html:33 stock/api.py:53
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:128 templates/InvenTree/search.html:196
@@ -2453,15 +2452,15 @@ msgid "Orders"
 msgstr "Bestellungen"
 
 #: company/templates/company/manufacturer_part_suppliers.html:22
-#: part/templates/part/supplier.html:22
+#: part/templates/part/supplier.html:23
 msgid "Delete supplier parts"
 msgstr "Zuliefererteil entfernen"
 
 #: company/templates/company/manufacturer_part_suppliers.html:22
 #: company/templates/company/manufacturer_part_suppliers.html:48
 #: company/templates/company/manufacturer_part_suppliers.html:142
-#: part/templates/part/manufacturer.html:24 part/templates/part/related.html:44
-#: part/templates/part/supplier.html:22 stock/views.py:844
+#: part/templates/part/related.html:44 part/templates/part/supplier.html:23
+#: part/templates/part/supplier.html:52 stock/views.py:844
 #: templates/js/company.js:203 users/models.py:193
 msgid "Delete"
 msgstr "Löschen"
@@ -2469,12 +2468,11 @@ msgstr "Löschen"
 #: company/templates/company/manufacturer_part_suppliers.html:37
 #: part/templates/part/category_navbar.html:46
 #: part/templates/part/category_navbar.html:49
-#: part/templates/part/navbar.html:25
 msgid "Parameters"
 msgstr "Parameter"
 
 #: company/templates/company/manufacturer_part_suppliers.html:43
-#: part/templates/part/params.html:18
+#: part/templates/part/detail.html:254
 #: templates/InvenTree/settings/category.html:29
 #: templates/InvenTree/settings/part.html:65
 msgid "New Parameter"
@@ -2485,12 +2483,12 @@ msgid "Delete parameters"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:80
-#: part/templates/part/params.html:57
+#: part/templates/part/detail.html:316
 msgid "Add Parameter"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:97
-#: part/templates/part/supplier.html:51
+#: part/templates/part/supplier.html:81
 msgid "Create new supplier"
 msgstr "Neuen Zulieferer anlegen"
 
@@ -2512,7 +2510,7 @@ msgstr "Hergestellte Teile"
 msgid "Supplied Parts"
 msgstr "Zuliefererteile"
 
-#: company/templates/company/navbar.html:38 part/templates/part/navbar.html:36
+#: company/templates/company/navbar.html:38 part/templates/part/navbar.html:30
 #: stock/templates/stock/location.html:107
 #: stock/templates/stock/location.html:122
 #: stock/templates/stock/location.html:136
@@ -2529,7 +2527,7 @@ msgstr "Teilbestand"
 #: company/templates/company/sales_orders.html:11
 #: order/templates/order/sales_orders.html:8
 #: order/templates/order/sales_orders.html:13
-#: part/templates/part/navbar.html:101 part/templates/part/navbar.html:104
+#: part/templates/part/navbar.html:89 part/templates/part/navbar.html:92
 #: part/templates/part/sales_orders.html:10 templates/InvenTree/index.html:236
 #: templates/InvenTree/search.html:345
 #: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:46
@@ -2541,7 +2539,7 @@ msgstr "Aufträge"
 #: company/templates/company/purchase_orders.html:10
 #: order/templates/order/purchase_orders.html:8
 #: order/templates/order/purchase_orders.html:13
-#: part/templates/part/navbar.html:93 part/templates/part/navbar.html:96
+#: part/templates/part/navbar.html:81 part/templates/part/navbar.html:84
 #: part/templates/part/orders.html:10 templates/InvenTree/index.html:213
 #: templates/InvenTree/search.html:325
 #: templates/InvenTree/settings/tabs.html:37 templates/navbar.html:37
@@ -2621,7 +2619,7 @@ msgid "Order Part"
 msgstr "Teil bestellen"
 
 #: company/templates/company/supplier_part_pricing.html:11
-#: part/templates/part/navbar.html:74
+#: part/templates/part/navbar.html:68
 msgid "Pricing Information"
 msgstr "Preisinformationen ansehen"
 
@@ -2651,8 +2649,7 @@ msgstr "Preisstaffel bearbeiten"
 msgid "Delete price break"
 msgstr "Preisstaffel löschen"
 
-#: company/views.py:65 part/templates/part/navbar.html:81
-#: part/templates/part/navbar.html:84 part/templates/part/prices.html:157
+#: company/views.py:65 part/templates/part/prices.html:157
 #: templates/InvenTree/search.html:306 templates/navbar.html:36
 msgid "Manufacturers"
 msgstr "Hersteller"
@@ -4201,8 +4198,8 @@ msgstr ""
 msgid "Part Attachments"
 msgstr "Anhänge"
 
-#: part/templates/part/bom.html:10 part/templates/part/navbar.html:51
-#: part/templates/part/navbar.html:54
+#: part/templates/part/bom.html:10 part/templates/part/navbar.html:45
+#: part/templates/part/navbar.html:48
 msgid "Bill of Materials"
 msgstr "Stückliste"
 
@@ -4477,7 +4474,7 @@ msgid "Import Parts"
 msgstr ""
 
 #: part/templates/part/category_parametric.html:10
-#: part/templates/part/navbar.html:22 part/templates/part/params.html:10
+#: part/templates/part/detail.html:246
 msgid "Part Parameters"
 msgstr "Teilparameter"
 
@@ -4585,6 +4582,10 @@ msgstr "Teil ist aktiv"
 msgid "Part is not active"
 msgstr "Teil ist nicht aktiv"
 
+#: part/templates/part/detail.html:253
+msgid "Add new parameter"
+msgstr "Parameter hinzufügen"
+
 #: part/templates/part/import_wizard/ajax_part_upload.html:29
 #: part/templates/part/import_wizard/part_upload.html:51
 msgid "Unsuffitient privileges."
@@ -4594,64 +4595,49 @@ msgstr ""
 msgid "Import Parts from File"
 msgstr ""
 
-#: part/templates/part/manufacturer.html:11
-msgid "Part Manufacturers"
-msgstr "Teil-Hersteller"
-
-#: part/templates/part/manufacturer.html:24
-msgid "Delete manufacturer parts"
-msgstr "Herstellerteile löschen"
-
-#: part/templates/part/manufacturer.html:53
-#: part/templates/part/supplier.html:56
-msgid "Create new manufacturer"
-msgstr "Neuen Hersteller anlegen"
-
-#: part/templates/part/navbar.html:29 part/templates/part/variants.html:11
+#: part/templates/part/navbar.html:23 part/templates/part/variants.html:11
 msgid "Part Variants"
 msgstr "Teil Varianten"
 
-#: part/templates/part/navbar.html:32
+#: part/templates/part/navbar.html:26
 msgid "Variants"
 msgstr "Varianten"
 
-#: part/templates/part/navbar.html:43
+#: part/templates/part/navbar.html:37
 msgid "Allocated Stock"
 msgstr "Lagerbestand zuweisen"
 
-#: part/templates/part/navbar.html:46
+#: part/templates/part/navbar.html:40
 msgid "Allocations"
 msgstr "Zuweisungen"
 
-#: part/templates/part/navbar.html:67 part/templates/part/navbar.html:70
+#: part/templates/part/navbar.html:61 part/templates/part/navbar.html:64
 msgid "Used In"
 msgstr "Benutzt in"
 
-#: part/templates/part/navbar.html:77
+#: part/templates/part/navbar.html:71
 msgid "Prices"
 msgstr ""
 
-#: part/templates/part/navbar.html:109 part/templates/part/part_tests.html:10
+#: part/templates/part/navbar.html:97 part/templates/part/part_tests.html:10
 msgid "Part Test Templates"
 msgstr "Teil Test-Vorlagen"
 
-#: part/templates/part/navbar.html:112 stock/templates/stock/item_base.html:426
-msgid "Tests"
-msgstr "Tests"
+#: part/templates/part/navbar.html:100
+#, fuzzy
+#| msgid "Part Test Templates"
+msgid "Test Templates"
+msgstr "Teil Test-Vorlagen"
 
-#: part/templates/part/navbar.html:117 part/templates/part/navbar.html:120
+#: part/templates/part/navbar.html:105 part/templates/part/navbar.html:108
 #: part/templates/part/related.html:10
 msgid "Related Parts"
 msgstr "Verknüpfte Teile"
 
-#: part/templates/part/navbar.html:130 part/templates/part/notes.html:12
+#: part/templates/part/navbar.html:118 part/templates/part/notes.html:12
 msgid "Part Notes"
 msgstr "Teil-Bemerkungen"
 
-#: part/templates/part/params.html:17
-msgid "Add new parameter"
-msgstr "Parameter hinzufügen"
-
 #: part/templates/part/part_app_base.html:12
 msgid "Part List"
 msgstr "Teileliste"
@@ -4979,10 +4965,22 @@ msgstr "Kein Bestand"
 msgid "Low Stock"
 msgstr "niedriger Bestand"
 
-#: part/templates/part/supplier.html:10
+#: part/templates/part/supplier.html:11
 msgid "Part Suppliers"
 msgstr "Zulieferer"
 
+#: part/templates/part/supplier.html:39
+msgid "Part Manufacturers"
+msgstr "Teil-Hersteller"
+
+#: part/templates/part/supplier.html:52
+msgid "Delete manufacturer parts"
+msgstr "Herstellerteile löschen"
+
+#: part/templates/part/supplier.html:86 part/templates/part/supplier.html:162
+msgid "Create new manufacturer"
+msgstr "Neuen Hersteller anlegen"
+
 #: part/templates/part/track.html:10
 msgid "Part Tracking"
 msgstr "Teileverfolgung"
@@ -5787,6 +5785,10 @@ msgstr "Letzte Inventur"
 msgid "No stocktake performed"
 msgstr "Keine Inventur ausgeführt"
 
+#: stock/templates/stock/item_base.html:426
+msgid "Tests"
+msgstr "Tests"
+
 #: stock/templates/stock/item_base.html:511
 msgid "Edit Stock Status"
 msgstr ""
@@ -6265,11 +6267,13 @@ msgstr "Farbschemata"
 
 #: templates/InvenTree/settings/appearance.html:29
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
 "        Please select another color theme :)\n"
 "    "
-msgstr "\n"
+msgstr ""
+"\n"
 "\t\tDie CSS Datei \"%(invalid_color_theme)s.css\" für das aktuell ausgewählte Farbschema wurde nicht gefunden.<br>\n"
 "\t\tBitte ein anderes Farbschema auswählen:)\n"
 "\t    "
@@ -7916,4 +7920,3 @@ msgstr "Berechtigungen Einträge zu ändern"
 #: users/models.py:193
 msgid "Permission to delete items"
 msgstr "Berechtigung Einträge zu löschen"
-
diff --git a/InvenTree/locale/en/LC_MESSAGES/django.po b/InvenTree/locale/en/LC_MESSAGES/django.po
index b73efcf505..d61e3a2a14 100644
--- a/InvenTree/locale/en/LC_MESSAGES/django.po
+++ b/InvenTree/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-09 05:10+0000\n"
+"POT-Creation-Date: 2021-07-09 06:58+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -604,8 +604,8 @@ msgstr ""
 #: build/models.py:110 build/templates/build/index.html:8
 #: build/templates/build/index.html:15 order/templates/order/so_builds.html:12
 #: order/templates/order/so_navbar.html:19
-#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:58
-#: part/templates/part/navbar.html:61 templates/InvenTree/index.html:191
+#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:52
+#: part/templates/part/navbar.html:55 templates/InvenTree/index.html:191
 #: templates/InvenTree/search.html:185
 #: templates/InvenTree/settings/tabs.html:34 users/models.py:44
 msgid "Build Orders"
@@ -784,7 +784,7 @@ msgstr ""
 #: order/templates/order/sales_order_detail.html:319
 #: order/templates/order/so_navbar.html:33
 #: order/templates/order/so_navbar.html:36 part/models.py:864
-#: part/templates/part/navbar.html:133
+#: part/templates/part/navbar.html:121
 #: report/templates/report/inventree_build_order_base.html:173
 #: stock/forms.py:140 stock/forms.py:284 stock/forms.py:316 stock/forms.py:344
 #: stock/models.py:536 stock/models.py:1678 stock/models.py:1784
@@ -936,8 +936,8 @@ msgstr ""
 #: build/templates/build/attachments.html:12
 #: build/templates/build/navbar.html:43 build/templates/build/navbar.html:46
 #: order/templates/order/po_navbar.html:35
-#: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:124
-#: part/templates/part/navbar.html:127 stock/templates/stock/navbar.html:47
+#: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:112
+#: part/templates/part/navbar.html:115 stock/templates/stock/navbar.html:47
 #: stock/templates/stock/navbar.html:50
 msgid "Attachments"
 msgstr ""
@@ -2287,7 +2287,7 @@ msgid "Create new manufacturer part"
 msgstr ""
 
 #: company/templates/company/detail_manufacturer_part.html:23
-#: part/templates/part/manufacturer.html:19
+#: part/templates/part/supplier.html:47
 msgid "New Manufacturer Part"
 msgstr ""
 
@@ -2295,9 +2295,8 @@ msgstr ""
 #: company/templates/company/detail_supplier_part.html:27
 #: company/templates/company/manufacturer_part_suppliers.html:20
 #: company/templates/company/manufacturer_part_suppliers.html:46
-#: part/templates/part/category.html:131
-#: part/templates/part/manufacturer.html:22
-#: part/templates/part/supplier.html:20
+#: part/templates/part/category.html:131 part/templates/part/supplier.html:21
+#: part/templates/part/supplier.html:50
 msgid "Options"
 msgstr ""
 
@@ -2330,8 +2329,8 @@ msgid "Create new Part"
 msgstr ""
 
 #: company/templates/company/detail_manufacturer_part.html:74
-#: company/views.py:66 part/templates/part/manufacturer.html:52
-#: part/templates/part/supplier.html:55
+#: company/views.py:66 part/templates/part/supplier.html:85
+#: part/templates/part/supplier.html:161
 msgid "New Manufacturer"
 msgstr ""
 
@@ -2364,14 +2363,14 @@ msgstr ""
 
 #: company/templates/company/detail_supplier_part.html:22
 #: company/templates/company/manufacturer_part_suppliers.html:17
-#: part/templates/part/part_base.html:432 part/templates/part/supplier.html:17
+#: part/templates/part/part_base.html:432 part/templates/part/supplier.html:18
 #: templates/js/stock.js:1341
 msgid "New Supplier Part"
 msgstr ""
 
 #: company/templates/company/detail_supplier_part.html:72
 #: company/templates/company/manufacturer_part_suppliers.html:96
-#: company/views.py:60 part/templates/part/supplier.html:50
+#: company/views.py:60 part/templates/part/supplier.html:80
 msgid "New Supplier"
 msgstr ""
 
@@ -2420,8 +2419,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part_navbar.html:14
 #: company/templates/company/manufacturer_part_suppliers.html:10
-#: company/views.py:59 part/templates/part/navbar.html:87
-#: part/templates/part/navbar.html:90 part/templates/part/prices.html:153
+#: company/views.py:59 part/templates/part/navbar.html:75
+#: part/templates/part/navbar.html:78 part/templates/part/prices.html:153
 #: templates/InvenTree/search.html:316 templates/navbar.html:35
 msgid "Suppliers"
 msgstr ""
@@ -2433,7 +2432,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part_navbar.html:22
 #: company/templates/company/navbar.html:41
 #: company/templates/company/supplier_part_navbar.html:15
-#: part/templates/part/navbar.html:39 stock/api.py:53
+#: part/templates/part/navbar.html:33 stock/api.py:53
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:128 templates/InvenTree/search.html:196
@@ -2454,15 +2453,15 @@ msgid "Orders"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:22
-#: part/templates/part/supplier.html:22
+#: part/templates/part/supplier.html:23
 msgid "Delete supplier parts"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:22
 #: company/templates/company/manufacturer_part_suppliers.html:48
 #: company/templates/company/manufacturer_part_suppliers.html:142
-#: part/templates/part/manufacturer.html:24 part/templates/part/related.html:44
-#: part/templates/part/supplier.html:22 stock/views.py:844
+#: part/templates/part/related.html:44 part/templates/part/supplier.html:23
+#: part/templates/part/supplier.html:52 stock/views.py:844
 #: templates/js/company.js:203 users/models.py:193
 msgid "Delete"
 msgstr ""
@@ -2470,12 +2469,11 @@ msgstr ""
 #: company/templates/company/manufacturer_part_suppliers.html:37
 #: part/templates/part/category_navbar.html:46
 #: part/templates/part/category_navbar.html:49
-#: part/templates/part/navbar.html:25
 msgid "Parameters"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:43
-#: part/templates/part/params.html:18
+#: part/templates/part/detail.html:254
 #: templates/InvenTree/settings/category.html:29
 #: templates/InvenTree/settings/part.html:65
 msgid "New Parameter"
@@ -2486,12 +2484,12 @@ msgid "Delete parameters"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:80
-#: part/templates/part/params.html:57
+#: part/templates/part/detail.html:316
 msgid "Add Parameter"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:97
-#: part/templates/part/supplier.html:51
+#: part/templates/part/supplier.html:81
 msgid "Create new supplier"
 msgstr ""
 
@@ -2513,7 +2511,7 @@ msgstr ""
 msgid "Supplied Parts"
 msgstr ""
 
-#: company/templates/company/navbar.html:38 part/templates/part/navbar.html:36
+#: company/templates/company/navbar.html:38 part/templates/part/navbar.html:30
 #: stock/templates/stock/location.html:107
 #: stock/templates/stock/location.html:122
 #: stock/templates/stock/location.html:136
@@ -2530,7 +2528,7 @@ msgstr ""
 #: company/templates/company/sales_orders.html:11
 #: order/templates/order/sales_orders.html:8
 #: order/templates/order/sales_orders.html:13
-#: part/templates/part/navbar.html:101 part/templates/part/navbar.html:104
+#: part/templates/part/navbar.html:89 part/templates/part/navbar.html:92
 #: part/templates/part/sales_orders.html:10 templates/InvenTree/index.html:236
 #: templates/InvenTree/search.html:345
 #: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:46
@@ -2542,7 +2540,7 @@ msgstr ""
 #: company/templates/company/purchase_orders.html:10
 #: order/templates/order/purchase_orders.html:8
 #: order/templates/order/purchase_orders.html:13
-#: part/templates/part/navbar.html:93 part/templates/part/navbar.html:96
+#: part/templates/part/navbar.html:81 part/templates/part/navbar.html:84
 #: part/templates/part/orders.html:10 templates/InvenTree/index.html:213
 #: templates/InvenTree/search.html:325
 #: templates/InvenTree/settings/tabs.html:37 templates/navbar.html:37
@@ -2622,7 +2620,7 @@ msgid "Order Part"
 msgstr ""
 
 #: company/templates/company/supplier_part_pricing.html:11
-#: part/templates/part/navbar.html:74
+#: part/templates/part/navbar.html:68
 msgid "Pricing Information"
 msgstr ""
 
@@ -2652,8 +2650,7 @@ msgstr ""
 msgid "Delete price break"
 msgstr ""
 
-#: company/views.py:65 part/templates/part/navbar.html:81
-#: part/templates/part/navbar.html:84 part/templates/part/prices.html:157
+#: company/views.py:65 part/templates/part/prices.html:157
 #: templates/InvenTree/search.html:306 templates/navbar.html:36
 msgid "Manufacturers"
 msgstr ""
@@ -4202,8 +4199,8 @@ msgstr ""
 msgid "Part Attachments"
 msgstr ""
 
-#: part/templates/part/bom.html:10 part/templates/part/navbar.html:51
-#: part/templates/part/navbar.html:54
+#: part/templates/part/bom.html:10 part/templates/part/navbar.html:45
+#: part/templates/part/navbar.html:48
 msgid "Bill of Materials"
 msgstr ""
 
@@ -4478,7 +4475,7 @@ msgid "Import Parts"
 msgstr ""
 
 #: part/templates/part/category_parametric.html:10
-#: part/templates/part/navbar.html:22 part/templates/part/params.html:10
+#: part/templates/part/detail.html:246
 msgid "Part Parameters"
 msgstr ""
 
@@ -4586,6 +4583,10 @@ msgstr ""
 msgid "Part is not active"
 msgstr ""
 
+#: part/templates/part/detail.html:253
+msgid "Add new parameter"
+msgstr ""
+
 #: part/templates/part/import_wizard/ajax_part_upload.html:29
 #: part/templates/part/import_wizard/part_upload.html:51
 msgid "Unsuffitient privileges."
@@ -4595,64 +4596,47 @@ msgstr ""
 msgid "Import Parts from File"
 msgstr ""
 
-#: part/templates/part/manufacturer.html:11
-msgid "Part Manufacturers"
-msgstr ""
-
-#: part/templates/part/manufacturer.html:24
-msgid "Delete manufacturer parts"
-msgstr ""
-
-#: part/templates/part/manufacturer.html:53
-#: part/templates/part/supplier.html:56
-msgid "Create new manufacturer"
-msgstr ""
-
-#: part/templates/part/navbar.html:29 part/templates/part/variants.html:11
+#: part/templates/part/navbar.html:23 part/templates/part/variants.html:11
 msgid "Part Variants"
 msgstr ""
 
-#: part/templates/part/navbar.html:32
+#: part/templates/part/navbar.html:26
 msgid "Variants"
 msgstr ""
 
-#: part/templates/part/navbar.html:43
+#: part/templates/part/navbar.html:37
 msgid "Allocated Stock"
 msgstr ""
 
-#: part/templates/part/navbar.html:46
+#: part/templates/part/navbar.html:40
 msgid "Allocations"
 msgstr ""
 
-#: part/templates/part/navbar.html:67 part/templates/part/navbar.html:70
+#: part/templates/part/navbar.html:61 part/templates/part/navbar.html:64
 msgid "Used In"
 msgstr ""
 
-#: part/templates/part/navbar.html:77
+#: part/templates/part/navbar.html:71
 msgid "Prices"
 msgstr ""
 
-#: part/templates/part/navbar.html:109 part/templates/part/part_tests.html:10
+#: part/templates/part/navbar.html:97 part/templates/part/part_tests.html:10
 msgid "Part Test Templates"
 msgstr ""
 
-#: part/templates/part/navbar.html:112 stock/templates/stock/item_base.html:426
-msgid "Tests"
+#: part/templates/part/navbar.html:100
+msgid "Test Templates"
 msgstr ""
 
-#: part/templates/part/navbar.html:117 part/templates/part/navbar.html:120
+#: part/templates/part/navbar.html:105 part/templates/part/navbar.html:108
 #: part/templates/part/related.html:10
 msgid "Related Parts"
 msgstr ""
 
-#: part/templates/part/navbar.html:130 part/templates/part/notes.html:12
+#: part/templates/part/navbar.html:118 part/templates/part/notes.html:12
 msgid "Part Notes"
 msgstr ""
 
-#: part/templates/part/params.html:17
-msgid "Add new parameter"
-msgstr ""
-
 #: part/templates/part/part_app_base.html:12
 msgid "Part List"
 msgstr ""
@@ -4980,10 +4964,22 @@ msgstr ""
 msgid "Low Stock"
 msgstr ""
 
-#: part/templates/part/supplier.html:10
+#: part/templates/part/supplier.html:11
 msgid "Part Suppliers"
 msgstr ""
 
+#: part/templates/part/supplier.html:39
+msgid "Part Manufacturers"
+msgstr ""
+
+#: part/templates/part/supplier.html:52
+msgid "Delete manufacturer parts"
+msgstr ""
+
+#: part/templates/part/supplier.html:86 part/templates/part/supplier.html:162
+msgid "Create new manufacturer"
+msgstr ""
+
 #: part/templates/part/track.html:10
 msgid "Part Tracking"
 msgstr ""
@@ -5788,6 +5784,10 @@ msgstr ""
 msgid "No stocktake performed"
 msgstr ""
 
+#: stock/templates/stock/item_base.html:426
+msgid "Tests"
+msgstr ""
+
 #: stock/templates/stock/item_base.html:511
 msgid "Edit Stock Status"
 msgstr ""
diff --git a/InvenTree/locale/es/LC_MESSAGES/django.po b/InvenTree/locale/es/LC_MESSAGES/django.po
index 4020ee1a8a..31c5a3664d 100644
--- a/InvenTree/locale/es/LC_MESSAGES/django.po
+++ b/InvenTree/locale/es/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-09 05:10+0000\n"
+"POT-Creation-Date: 2021-07-09 06:58+0000\n"
 "PO-Revision-Date: 2021-07-09 05:50\n"
 "Last-Translator: \n"
 "Language-Team: Spanish\n"
@@ -603,8 +603,8 @@ msgstr ""
 #: build/models.py:110 build/templates/build/index.html:8
 #: build/templates/build/index.html:15 order/templates/order/so_builds.html:12
 #: order/templates/order/so_navbar.html:19
-#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:58
-#: part/templates/part/navbar.html:61 templates/InvenTree/index.html:191
+#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:52
+#: part/templates/part/navbar.html:55 templates/InvenTree/index.html:191
 #: templates/InvenTree/search.html:185
 #: templates/InvenTree/settings/tabs.html:34 users/models.py:44
 msgid "Build Orders"
@@ -783,7 +783,7 @@ msgstr ""
 #: order/templates/order/sales_order_detail.html:319
 #: order/templates/order/so_navbar.html:33
 #: order/templates/order/so_navbar.html:36 part/models.py:864
-#: part/templates/part/navbar.html:133
+#: part/templates/part/navbar.html:121
 #: report/templates/report/inventree_build_order_base.html:173
 #: stock/forms.py:140 stock/forms.py:284 stock/forms.py:316 stock/forms.py:344
 #: stock/models.py:536 stock/models.py:1678 stock/models.py:1784
@@ -935,8 +935,8 @@ msgstr "Número de serie"
 #: build/templates/build/attachments.html:12
 #: build/templates/build/navbar.html:43 build/templates/build/navbar.html:46
 #: order/templates/order/po_navbar.html:35
-#: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:124
-#: part/templates/part/navbar.html:127 stock/templates/stock/navbar.html:47
+#: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:112
+#: part/templates/part/navbar.html:115 stock/templates/stock/navbar.html:47
 #: stock/templates/stock/navbar.html:50
 msgid "Attachments"
 msgstr ""
@@ -2286,7 +2286,7 @@ msgid "Create new manufacturer part"
 msgstr ""
 
 #: company/templates/company/detail_manufacturer_part.html:23
-#: part/templates/part/manufacturer.html:19
+#: part/templates/part/supplier.html:47
 msgid "New Manufacturer Part"
 msgstr ""
 
@@ -2294,9 +2294,8 @@ msgstr ""
 #: company/templates/company/detail_supplier_part.html:27
 #: company/templates/company/manufacturer_part_suppliers.html:20
 #: company/templates/company/manufacturer_part_suppliers.html:46
-#: part/templates/part/category.html:131
-#: part/templates/part/manufacturer.html:22
-#: part/templates/part/supplier.html:20
+#: part/templates/part/category.html:131 part/templates/part/supplier.html:21
+#: part/templates/part/supplier.html:50
 msgid "Options"
 msgstr "Opciones"
 
@@ -2329,8 +2328,8 @@ msgid "Create new Part"
 msgstr ""
 
 #: company/templates/company/detail_manufacturer_part.html:74
-#: company/views.py:66 part/templates/part/manufacturer.html:52
-#: part/templates/part/supplier.html:55
+#: company/views.py:66 part/templates/part/supplier.html:85
+#: part/templates/part/supplier.html:161
 msgid "New Manufacturer"
 msgstr ""
 
@@ -2363,14 +2362,14 @@ msgstr ""
 
 #: company/templates/company/detail_supplier_part.html:22
 #: company/templates/company/manufacturer_part_suppliers.html:17
-#: part/templates/part/part_base.html:432 part/templates/part/supplier.html:17
+#: part/templates/part/part_base.html:432 part/templates/part/supplier.html:18
 #: templates/js/stock.js:1341
 msgid "New Supplier Part"
 msgstr ""
 
 #: company/templates/company/detail_supplier_part.html:72
 #: company/templates/company/manufacturer_part_suppliers.html:96
-#: company/views.py:60 part/templates/part/supplier.html:50
+#: company/views.py:60 part/templates/part/supplier.html:80
 msgid "New Supplier"
 msgstr ""
 
@@ -2419,8 +2418,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part_navbar.html:14
 #: company/templates/company/manufacturer_part_suppliers.html:10
-#: company/views.py:59 part/templates/part/navbar.html:87
-#: part/templates/part/navbar.html:90 part/templates/part/prices.html:153
+#: company/views.py:59 part/templates/part/navbar.html:75
+#: part/templates/part/navbar.html:78 part/templates/part/prices.html:153
 #: templates/InvenTree/search.html:316 templates/navbar.html:35
 msgid "Suppliers"
 msgstr ""
@@ -2432,7 +2431,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part_navbar.html:22
 #: company/templates/company/navbar.html:41
 #: company/templates/company/supplier_part_navbar.html:15
-#: part/templates/part/navbar.html:39 stock/api.py:53
+#: part/templates/part/navbar.html:33 stock/api.py:53
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:128 templates/InvenTree/search.html:196
@@ -2453,15 +2452,15 @@ msgid "Orders"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:22
-#: part/templates/part/supplier.html:22
+#: part/templates/part/supplier.html:23
 msgid "Delete supplier parts"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:22
 #: company/templates/company/manufacturer_part_suppliers.html:48
 #: company/templates/company/manufacturer_part_suppliers.html:142
-#: part/templates/part/manufacturer.html:24 part/templates/part/related.html:44
-#: part/templates/part/supplier.html:22 stock/views.py:844
+#: part/templates/part/related.html:44 part/templates/part/supplier.html:23
+#: part/templates/part/supplier.html:52 stock/views.py:844
 #: templates/js/company.js:203 users/models.py:193
 msgid "Delete"
 msgstr "Eliminar"
@@ -2469,12 +2468,11 @@ msgstr "Eliminar"
 #: company/templates/company/manufacturer_part_suppliers.html:37
 #: part/templates/part/category_navbar.html:46
 #: part/templates/part/category_navbar.html:49
-#: part/templates/part/navbar.html:25
 msgid "Parameters"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:43
-#: part/templates/part/params.html:18
+#: part/templates/part/detail.html:254
 #: templates/InvenTree/settings/category.html:29
 #: templates/InvenTree/settings/part.html:65
 msgid "New Parameter"
@@ -2485,12 +2483,12 @@ msgid "Delete parameters"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:80
-#: part/templates/part/params.html:57
+#: part/templates/part/detail.html:316
 msgid "Add Parameter"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:97
-#: part/templates/part/supplier.html:51
+#: part/templates/part/supplier.html:81
 msgid "Create new supplier"
 msgstr ""
 
@@ -2512,7 +2510,7 @@ msgstr ""
 msgid "Supplied Parts"
 msgstr ""
 
-#: company/templates/company/navbar.html:38 part/templates/part/navbar.html:36
+#: company/templates/company/navbar.html:38 part/templates/part/navbar.html:30
 #: stock/templates/stock/location.html:107
 #: stock/templates/stock/location.html:122
 #: stock/templates/stock/location.html:136
@@ -2529,7 +2527,7 @@ msgstr ""
 #: company/templates/company/sales_orders.html:11
 #: order/templates/order/sales_orders.html:8
 #: order/templates/order/sales_orders.html:13
-#: part/templates/part/navbar.html:101 part/templates/part/navbar.html:104
+#: part/templates/part/navbar.html:89 part/templates/part/navbar.html:92
 #: part/templates/part/sales_orders.html:10 templates/InvenTree/index.html:236
 #: templates/InvenTree/search.html:345
 #: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:46
@@ -2541,7 +2539,7 @@ msgstr ""
 #: company/templates/company/purchase_orders.html:10
 #: order/templates/order/purchase_orders.html:8
 #: order/templates/order/purchase_orders.html:13
-#: part/templates/part/navbar.html:93 part/templates/part/navbar.html:96
+#: part/templates/part/navbar.html:81 part/templates/part/navbar.html:84
 #: part/templates/part/orders.html:10 templates/InvenTree/index.html:213
 #: templates/InvenTree/search.html:325
 #: templates/InvenTree/settings/tabs.html:37 templates/navbar.html:37
@@ -2621,7 +2619,7 @@ msgid "Order Part"
 msgstr ""
 
 #: company/templates/company/supplier_part_pricing.html:11
-#: part/templates/part/navbar.html:74
+#: part/templates/part/navbar.html:68
 msgid "Pricing Information"
 msgstr ""
 
@@ -2651,8 +2649,7 @@ msgstr ""
 msgid "Delete price break"
 msgstr ""
 
-#: company/views.py:65 part/templates/part/navbar.html:81
-#: part/templates/part/navbar.html:84 part/templates/part/prices.html:157
+#: company/views.py:65 part/templates/part/prices.html:157
 #: templates/InvenTree/search.html:306 templates/navbar.html:36
 msgid "Manufacturers"
 msgstr "Fabricantes"
@@ -4201,8 +4198,8 @@ msgstr ""
 msgid "Part Attachments"
 msgstr ""
 
-#: part/templates/part/bom.html:10 part/templates/part/navbar.html:51
-#: part/templates/part/navbar.html:54
+#: part/templates/part/bom.html:10 part/templates/part/navbar.html:45
+#: part/templates/part/navbar.html:48
 msgid "Bill of Materials"
 msgstr ""
 
@@ -4477,7 +4474,7 @@ msgid "Import Parts"
 msgstr ""
 
 #: part/templates/part/category_parametric.html:10
-#: part/templates/part/navbar.html:22 part/templates/part/params.html:10
+#: part/templates/part/detail.html:246
 msgid "Part Parameters"
 msgstr ""
 
@@ -4585,6 +4582,10 @@ msgstr ""
 msgid "Part is not active"
 msgstr ""
 
+#: part/templates/part/detail.html:253
+msgid "Add new parameter"
+msgstr ""
+
 #: part/templates/part/import_wizard/ajax_part_upload.html:29
 #: part/templates/part/import_wizard/part_upload.html:51
 msgid "Unsuffitient privileges."
@@ -4594,64 +4595,47 @@ msgstr ""
 msgid "Import Parts from File"
 msgstr ""
 
-#: part/templates/part/manufacturer.html:11
-msgid "Part Manufacturers"
-msgstr ""
-
-#: part/templates/part/manufacturer.html:24
-msgid "Delete manufacturer parts"
-msgstr ""
-
-#: part/templates/part/manufacturer.html:53
-#: part/templates/part/supplier.html:56
-msgid "Create new manufacturer"
-msgstr ""
-
-#: part/templates/part/navbar.html:29 part/templates/part/variants.html:11
+#: part/templates/part/navbar.html:23 part/templates/part/variants.html:11
 msgid "Part Variants"
 msgstr ""
 
-#: part/templates/part/navbar.html:32
+#: part/templates/part/navbar.html:26
 msgid "Variants"
 msgstr ""
 
-#: part/templates/part/navbar.html:43
+#: part/templates/part/navbar.html:37
 msgid "Allocated Stock"
 msgstr ""
 
-#: part/templates/part/navbar.html:46
+#: part/templates/part/navbar.html:40
 msgid "Allocations"
 msgstr ""
 
-#: part/templates/part/navbar.html:67 part/templates/part/navbar.html:70
+#: part/templates/part/navbar.html:61 part/templates/part/navbar.html:64
 msgid "Used In"
 msgstr ""
 
-#: part/templates/part/navbar.html:77
+#: part/templates/part/navbar.html:71
 msgid "Prices"
 msgstr ""
 
-#: part/templates/part/navbar.html:109 part/templates/part/part_tests.html:10
+#: part/templates/part/navbar.html:97 part/templates/part/part_tests.html:10
 msgid "Part Test Templates"
 msgstr ""
 
-#: part/templates/part/navbar.html:112 stock/templates/stock/item_base.html:426
-msgid "Tests"
+#: part/templates/part/navbar.html:100
+msgid "Test Templates"
 msgstr ""
 
-#: part/templates/part/navbar.html:117 part/templates/part/navbar.html:120
+#: part/templates/part/navbar.html:105 part/templates/part/navbar.html:108
 #: part/templates/part/related.html:10
 msgid "Related Parts"
 msgstr ""
 
-#: part/templates/part/navbar.html:130 part/templates/part/notes.html:12
+#: part/templates/part/navbar.html:118 part/templates/part/notes.html:12
 msgid "Part Notes"
 msgstr ""
 
-#: part/templates/part/params.html:17
-msgid "Add new parameter"
-msgstr ""
-
 #: part/templates/part/part_app_base.html:12
 msgid "Part List"
 msgstr ""
@@ -4979,10 +4963,22 @@ msgstr ""
 msgid "Low Stock"
 msgstr ""
 
-#: part/templates/part/supplier.html:10
+#: part/templates/part/supplier.html:11
 msgid "Part Suppliers"
 msgstr ""
 
+#: part/templates/part/supplier.html:39
+msgid "Part Manufacturers"
+msgstr ""
+
+#: part/templates/part/supplier.html:52
+msgid "Delete manufacturer parts"
+msgstr ""
+
+#: part/templates/part/supplier.html:86 part/templates/part/supplier.html:162
+msgid "Create new manufacturer"
+msgstr ""
+
 #: part/templates/part/track.html:10
 msgid "Part Tracking"
 msgstr ""
@@ -5787,6 +5783,10 @@ msgstr ""
 msgid "No stocktake performed"
 msgstr ""
 
+#: stock/templates/stock/item_base.html:426
+msgid "Tests"
+msgstr ""
+
 #: stock/templates/stock/item_base.html:511
 msgid "Edit Stock Status"
 msgstr ""
@@ -6265,7 +6265,8 @@ msgstr ""
 
 #: templates/InvenTree/settings/appearance.html:29
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
 "        Please select another color theme :)\n"
 "    "
@@ -7913,4 +7914,3 @@ msgstr ""
 #: users/models.py:193
 msgid "Permission to delete items"
 msgstr ""
-
diff --git a/InvenTree/locale/fr/LC_MESSAGES/django.po b/InvenTree/locale/fr/LC_MESSAGES/django.po
index eb94279589..e21f61dc87 100644
--- a/InvenTree/locale/fr/LC_MESSAGES/django.po
+++ b/InvenTree/locale/fr/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-09 05:10+0000\n"
+"POT-Creation-Date: 2021-07-09 06:58+0000\n"
 "PO-Revision-Date: 2021-07-09 05:50\n"
 "Last-Translator: \n"
 "Language-Team: French\n"
@@ -603,8 +603,8 @@ msgstr ""
 #: build/models.py:110 build/templates/build/index.html:8
 #: build/templates/build/index.html:15 order/templates/order/so_builds.html:12
 #: order/templates/order/so_navbar.html:19
-#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:58
-#: part/templates/part/navbar.html:61 templates/InvenTree/index.html:191
+#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:52
+#: part/templates/part/navbar.html:55 templates/InvenTree/index.html:191
 #: templates/InvenTree/search.html:185
 #: templates/InvenTree/settings/tabs.html:34 users/models.py:44
 msgid "Build Orders"
@@ -783,7 +783,7 @@ msgstr ""
 #: order/templates/order/sales_order_detail.html:319
 #: order/templates/order/so_navbar.html:33
 #: order/templates/order/so_navbar.html:36 part/models.py:864
-#: part/templates/part/navbar.html:133
+#: part/templates/part/navbar.html:121
 #: report/templates/report/inventree_build_order_base.html:173
 #: stock/forms.py:140 stock/forms.py:284 stock/forms.py:316 stock/forms.py:344
 #: stock/models.py:536 stock/models.py:1678 stock/models.py:1784
@@ -935,8 +935,8 @@ msgstr ""
 #: build/templates/build/attachments.html:12
 #: build/templates/build/navbar.html:43 build/templates/build/navbar.html:46
 #: order/templates/order/po_navbar.html:35
-#: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:124
-#: part/templates/part/navbar.html:127 stock/templates/stock/navbar.html:47
+#: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:112
+#: part/templates/part/navbar.html:115 stock/templates/stock/navbar.html:47
 #: stock/templates/stock/navbar.html:50
 msgid "Attachments"
 msgstr "Pieces jointes"
@@ -2286,7 +2286,7 @@ msgid "Create new manufacturer part"
 msgstr ""
 
 #: company/templates/company/detail_manufacturer_part.html:23
-#: part/templates/part/manufacturer.html:19
+#: part/templates/part/supplier.html:47
 msgid "New Manufacturer Part"
 msgstr ""
 
@@ -2294,9 +2294,8 @@ msgstr ""
 #: company/templates/company/detail_supplier_part.html:27
 #: company/templates/company/manufacturer_part_suppliers.html:20
 #: company/templates/company/manufacturer_part_suppliers.html:46
-#: part/templates/part/category.html:131
-#: part/templates/part/manufacturer.html:22
-#: part/templates/part/supplier.html:20
+#: part/templates/part/category.html:131 part/templates/part/supplier.html:21
+#: part/templates/part/supplier.html:50
 msgid "Options"
 msgstr ""
 
@@ -2329,8 +2328,8 @@ msgid "Create new Part"
 msgstr ""
 
 #: company/templates/company/detail_manufacturer_part.html:74
-#: company/views.py:66 part/templates/part/manufacturer.html:52
-#: part/templates/part/supplier.html:55
+#: company/views.py:66 part/templates/part/supplier.html:85
+#: part/templates/part/supplier.html:161
 msgid "New Manufacturer"
 msgstr ""
 
@@ -2363,14 +2362,14 @@ msgstr ""
 
 #: company/templates/company/detail_supplier_part.html:22
 #: company/templates/company/manufacturer_part_suppliers.html:17
-#: part/templates/part/part_base.html:432 part/templates/part/supplier.html:17
+#: part/templates/part/part_base.html:432 part/templates/part/supplier.html:18
 #: templates/js/stock.js:1341
 msgid "New Supplier Part"
 msgstr ""
 
 #: company/templates/company/detail_supplier_part.html:72
 #: company/templates/company/manufacturer_part_suppliers.html:96
-#: company/views.py:60 part/templates/part/supplier.html:50
+#: company/views.py:60 part/templates/part/supplier.html:80
 msgid "New Supplier"
 msgstr ""
 
@@ -2419,8 +2418,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part_navbar.html:14
 #: company/templates/company/manufacturer_part_suppliers.html:10
-#: company/views.py:59 part/templates/part/navbar.html:87
-#: part/templates/part/navbar.html:90 part/templates/part/prices.html:153
+#: company/views.py:59 part/templates/part/navbar.html:75
+#: part/templates/part/navbar.html:78 part/templates/part/prices.html:153
 #: templates/InvenTree/search.html:316 templates/navbar.html:35
 msgid "Suppliers"
 msgstr ""
@@ -2432,7 +2431,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part_navbar.html:22
 #: company/templates/company/navbar.html:41
 #: company/templates/company/supplier_part_navbar.html:15
-#: part/templates/part/navbar.html:39 stock/api.py:53
+#: part/templates/part/navbar.html:33 stock/api.py:53
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:128 templates/InvenTree/search.html:196
@@ -2453,15 +2452,15 @@ msgid "Orders"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:22
-#: part/templates/part/supplier.html:22
+#: part/templates/part/supplier.html:23
 msgid "Delete supplier parts"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:22
 #: company/templates/company/manufacturer_part_suppliers.html:48
 #: company/templates/company/manufacturer_part_suppliers.html:142
-#: part/templates/part/manufacturer.html:24 part/templates/part/related.html:44
-#: part/templates/part/supplier.html:22 stock/views.py:844
+#: part/templates/part/related.html:44 part/templates/part/supplier.html:23
+#: part/templates/part/supplier.html:52 stock/views.py:844
 #: templates/js/company.js:203 users/models.py:193
 msgid "Delete"
 msgstr ""
@@ -2469,12 +2468,11 @@ msgstr ""
 #: company/templates/company/manufacturer_part_suppliers.html:37
 #: part/templates/part/category_navbar.html:46
 #: part/templates/part/category_navbar.html:49
-#: part/templates/part/navbar.html:25
 msgid "Parameters"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:43
-#: part/templates/part/params.html:18
+#: part/templates/part/detail.html:254
 #: templates/InvenTree/settings/category.html:29
 #: templates/InvenTree/settings/part.html:65
 msgid "New Parameter"
@@ -2485,12 +2483,12 @@ msgid "Delete parameters"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:80
-#: part/templates/part/params.html:57
+#: part/templates/part/detail.html:316
 msgid "Add Parameter"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:97
-#: part/templates/part/supplier.html:51
+#: part/templates/part/supplier.html:81
 msgid "Create new supplier"
 msgstr ""
 
@@ -2512,7 +2510,7 @@ msgstr ""
 msgid "Supplied Parts"
 msgstr ""
 
-#: company/templates/company/navbar.html:38 part/templates/part/navbar.html:36
+#: company/templates/company/navbar.html:38 part/templates/part/navbar.html:30
 #: stock/templates/stock/location.html:107
 #: stock/templates/stock/location.html:122
 #: stock/templates/stock/location.html:136
@@ -2529,7 +2527,7 @@ msgstr ""
 #: company/templates/company/sales_orders.html:11
 #: order/templates/order/sales_orders.html:8
 #: order/templates/order/sales_orders.html:13
-#: part/templates/part/navbar.html:101 part/templates/part/navbar.html:104
+#: part/templates/part/navbar.html:89 part/templates/part/navbar.html:92
 #: part/templates/part/sales_orders.html:10 templates/InvenTree/index.html:236
 #: templates/InvenTree/search.html:345
 #: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:46
@@ -2541,7 +2539,7 @@ msgstr ""
 #: company/templates/company/purchase_orders.html:10
 #: order/templates/order/purchase_orders.html:8
 #: order/templates/order/purchase_orders.html:13
-#: part/templates/part/navbar.html:93 part/templates/part/navbar.html:96
+#: part/templates/part/navbar.html:81 part/templates/part/navbar.html:84
 #: part/templates/part/orders.html:10 templates/InvenTree/index.html:213
 #: templates/InvenTree/search.html:325
 #: templates/InvenTree/settings/tabs.html:37 templates/navbar.html:37
@@ -2621,7 +2619,7 @@ msgid "Order Part"
 msgstr ""
 
 #: company/templates/company/supplier_part_pricing.html:11
-#: part/templates/part/navbar.html:74
+#: part/templates/part/navbar.html:68
 msgid "Pricing Information"
 msgstr ""
 
@@ -2651,8 +2649,7 @@ msgstr ""
 msgid "Delete price break"
 msgstr ""
 
-#: company/views.py:65 part/templates/part/navbar.html:81
-#: part/templates/part/navbar.html:84 part/templates/part/prices.html:157
+#: company/views.py:65 part/templates/part/prices.html:157
 #: templates/InvenTree/search.html:306 templates/navbar.html:36
 msgid "Manufacturers"
 msgstr ""
@@ -4201,8 +4198,8 @@ msgstr ""
 msgid "Part Attachments"
 msgstr ""
 
-#: part/templates/part/bom.html:10 part/templates/part/navbar.html:51
-#: part/templates/part/navbar.html:54
+#: part/templates/part/bom.html:10 part/templates/part/navbar.html:45
+#: part/templates/part/navbar.html:48
 msgid "Bill of Materials"
 msgstr ""
 
@@ -4477,7 +4474,7 @@ msgid "Import Parts"
 msgstr ""
 
 #: part/templates/part/category_parametric.html:10
-#: part/templates/part/navbar.html:22 part/templates/part/params.html:10
+#: part/templates/part/detail.html:246
 msgid "Part Parameters"
 msgstr ""
 
@@ -4585,6 +4582,10 @@ msgstr ""
 msgid "Part is not active"
 msgstr ""
 
+#: part/templates/part/detail.html:253
+msgid "Add new parameter"
+msgstr ""
+
 #: part/templates/part/import_wizard/ajax_part_upload.html:29
 #: part/templates/part/import_wizard/part_upload.html:51
 msgid "Unsuffitient privileges."
@@ -4594,64 +4595,47 @@ msgstr ""
 msgid "Import Parts from File"
 msgstr ""
 
-#: part/templates/part/manufacturer.html:11
-msgid "Part Manufacturers"
-msgstr ""
-
-#: part/templates/part/manufacturer.html:24
-msgid "Delete manufacturer parts"
-msgstr ""
-
-#: part/templates/part/manufacturer.html:53
-#: part/templates/part/supplier.html:56
-msgid "Create new manufacturer"
-msgstr ""
-
-#: part/templates/part/navbar.html:29 part/templates/part/variants.html:11
+#: part/templates/part/navbar.html:23 part/templates/part/variants.html:11
 msgid "Part Variants"
 msgstr ""
 
-#: part/templates/part/navbar.html:32
+#: part/templates/part/navbar.html:26
 msgid "Variants"
 msgstr ""
 
-#: part/templates/part/navbar.html:43
+#: part/templates/part/navbar.html:37
 msgid "Allocated Stock"
 msgstr ""
 
-#: part/templates/part/navbar.html:46
+#: part/templates/part/navbar.html:40
 msgid "Allocations"
 msgstr ""
 
-#: part/templates/part/navbar.html:67 part/templates/part/navbar.html:70
+#: part/templates/part/navbar.html:61 part/templates/part/navbar.html:64
 msgid "Used In"
 msgstr ""
 
-#: part/templates/part/navbar.html:77
+#: part/templates/part/navbar.html:71
 msgid "Prices"
 msgstr ""
 
-#: part/templates/part/navbar.html:109 part/templates/part/part_tests.html:10
+#: part/templates/part/navbar.html:97 part/templates/part/part_tests.html:10
 msgid "Part Test Templates"
 msgstr ""
 
-#: part/templates/part/navbar.html:112 stock/templates/stock/item_base.html:426
-msgid "Tests"
+#: part/templates/part/navbar.html:100
+msgid "Test Templates"
 msgstr ""
 
-#: part/templates/part/navbar.html:117 part/templates/part/navbar.html:120
+#: part/templates/part/navbar.html:105 part/templates/part/navbar.html:108
 #: part/templates/part/related.html:10
 msgid "Related Parts"
 msgstr ""
 
-#: part/templates/part/navbar.html:130 part/templates/part/notes.html:12
+#: part/templates/part/navbar.html:118 part/templates/part/notes.html:12
 msgid "Part Notes"
 msgstr ""
 
-#: part/templates/part/params.html:17
-msgid "Add new parameter"
-msgstr ""
-
 #: part/templates/part/part_app_base.html:12
 msgid "Part List"
 msgstr ""
@@ -4979,10 +4963,22 @@ msgstr ""
 msgid "Low Stock"
 msgstr ""
 
-#: part/templates/part/supplier.html:10
+#: part/templates/part/supplier.html:11
 msgid "Part Suppliers"
 msgstr ""
 
+#: part/templates/part/supplier.html:39
+msgid "Part Manufacturers"
+msgstr ""
+
+#: part/templates/part/supplier.html:52
+msgid "Delete manufacturer parts"
+msgstr ""
+
+#: part/templates/part/supplier.html:86 part/templates/part/supplier.html:162
+msgid "Create new manufacturer"
+msgstr ""
+
 #: part/templates/part/track.html:10
 msgid "Part Tracking"
 msgstr ""
@@ -5787,6 +5783,10 @@ msgstr ""
 msgid "No stocktake performed"
 msgstr ""
 
+#: stock/templates/stock/item_base.html:426
+msgid "Tests"
+msgstr ""
+
 #: stock/templates/stock/item_base.html:511
 msgid "Edit Stock Status"
 msgstr ""
@@ -6265,7 +6265,8 @@ msgstr ""
 
 #: templates/InvenTree/settings/appearance.html:29
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
 "        Please select another color theme :)\n"
 "    "
@@ -7913,4 +7914,3 @@ msgstr ""
 #: users/models.py:193
 msgid "Permission to delete items"
 msgstr ""
-
diff --git a/InvenTree/locale/it/LC_MESSAGES/django.po b/InvenTree/locale/it/LC_MESSAGES/django.po
index 3792f7b857..9b32a2939d 100644
--- a/InvenTree/locale/it/LC_MESSAGES/django.po
+++ b/InvenTree/locale/it/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-09 05:10+0000\n"
+"POT-Creation-Date: 2021-07-09 06:58+0000\n"
 "PO-Revision-Date: 2021-07-09 05:50\n"
 "Last-Translator: \n"
 "Language-Team: Italian\n"
@@ -603,8 +603,8 @@ msgstr ""
 #: build/models.py:110 build/templates/build/index.html:8
 #: build/templates/build/index.html:15 order/templates/order/so_builds.html:12
 #: order/templates/order/so_navbar.html:19
-#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:58
-#: part/templates/part/navbar.html:61 templates/InvenTree/index.html:191
+#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:52
+#: part/templates/part/navbar.html:55 templates/InvenTree/index.html:191
 #: templates/InvenTree/search.html:185
 #: templates/InvenTree/settings/tabs.html:34 users/models.py:44
 msgid "Build Orders"
@@ -783,7 +783,7 @@ msgstr ""
 #: order/templates/order/sales_order_detail.html:319
 #: order/templates/order/so_navbar.html:33
 #: order/templates/order/so_navbar.html:36 part/models.py:864
-#: part/templates/part/navbar.html:133
+#: part/templates/part/navbar.html:121
 #: report/templates/report/inventree_build_order_base.html:173
 #: stock/forms.py:140 stock/forms.py:284 stock/forms.py:316 stock/forms.py:344
 #: stock/models.py:536 stock/models.py:1678 stock/models.py:1784
@@ -935,8 +935,8 @@ msgstr ""
 #: build/templates/build/attachments.html:12
 #: build/templates/build/navbar.html:43 build/templates/build/navbar.html:46
 #: order/templates/order/po_navbar.html:35
-#: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:124
-#: part/templates/part/navbar.html:127 stock/templates/stock/navbar.html:47
+#: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:112
+#: part/templates/part/navbar.html:115 stock/templates/stock/navbar.html:47
 #: stock/templates/stock/navbar.html:50
 msgid "Attachments"
 msgstr ""
@@ -2286,7 +2286,7 @@ msgid "Create new manufacturer part"
 msgstr ""
 
 #: company/templates/company/detail_manufacturer_part.html:23
-#: part/templates/part/manufacturer.html:19
+#: part/templates/part/supplier.html:47
 msgid "New Manufacturer Part"
 msgstr ""
 
@@ -2294,9 +2294,8 @@ msgstr ""
 #: company/templates/company/detail_supplier_part.html:27
 #: company/templates/company/manufacturer_part_suppliers.html:20
 #: company/templates/company/manufacturer_part_suppliers.html:46
-#: part/templates/part/category.html:131
-#: part/templates/part/manufacturer.html:22
-#: part/templates/part/supplier.html:20
+#: part/templates/part/category.html:131 part/templates/part/supplier.html:21
+#: part/templates/part/supplier.html:50
 msgid "Options"
 msgstr ""
 
@@ -2329,8 +2328,8 @@ msgid "Create new Part"
 msgstr ""
 
 #: company/templates/company/detail_manufacturer_part.html:74
-#: company/views.py:66 part/templates/part/manufacturer.html:52
-#: part/templates/part/supplier.html:55
+#: company/views.py:66 part/templates/part/supplier.html:85
+#: part/templates/part/supplier.html:161
 msgid "New Manufacturer"
 msgstr ""
 
@@ -2363,14 +2362,14 @@ msgstr ""
 
 #: company/templates/company/detail_supplier_part.html:22
 #: company/templates/company/manufacturer_part_suppliers.html:17
-#: part/templates/part/part_base.html:432 part/templates/part/supplier.html:17
+#: part/templates/part/part_base.html:432 part/templates/part/supplier.html:18
 #: templates/js/stock.js:1341
 msgid "New Supplier Part"
 msgstr ""
 
 #: company/templates/company/detail_supplier_part.html:72
 #: company/templates/company/manufacturer_part_suppliers.html:96
-#: company/views.py:60 part/templates/part/supplier.html:50
+#: company/views.py:60 part/templates/part/supplier.html:80
 msgid "New Supplier"
 msgstr ""
 
@@ -2419,8 +2418,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part_navbar.html:14
 #: company/templates/company/manufacturer_part_suppliers.html:10
-#: company/views.py:59 part/templates/part/navbar.html:87
-#: part/templates/part/navbar.html:90 part/templates/part/prices.html:153
+#: company/views.py:59 part/templates/part/navbar.html:75
+#: part/templates/part/navbar.html:78 part/templates/part/prices.html:153
 #: templates/InvenTree/search.html:316 templates/navbar.html:35
 msgid "Suppliers"
 msgstr ""
@@ -2432,7 +2431,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part_navbar.html:22
 #: company/templates/company/navbar.html:41
 #: company/templates/company/supplier_part_navbar.html:15
-#: part/templates/part/navbar.html:39 stock/api.py:53
+#: part/templates/part/navbar.html:33 stock/api.py:53
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:128 templates/InvenTree/search.html:196
@@ -2453,15 +2452,15 @@ msgid "Orders"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:22
-#: part/templates/part/supplier.html:22
+#: part/templates/part/supplier.html:23
 msgid "Delete supplier parts"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:22
 #: company/templates/company/manufacturer_part_suppliers.html:48
 #: company/templates/company/manufacturer_part_suppliers.html:142
-#: part/templates/part/manufacturer.html:24 part/templates/part/related.html:44
-#: part/templates/part/supplier.html:22 stock/views.py:844
+#: part/templates/part/related.html:44 part/templates/part/supplier.html:23
+#: part/templates/part/supplier.html:52 stock/views.py:844
 #: templates/js/company.js:203 users/models.py:193
 msgid "Delete"
 msgstr ""
@@ -2469,12 +2468,11 @@ msgstr ""
 #: company/templates/company/manufacturer_part_suppliers.html:37
 #: part/templates/part/category_navbar.html:46
 #: part/templates/part/category_navbar.html:49
-#: part/templates/part/navbar.html:25
 msgid "Parameters"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:43
-#: part/templates/part/params.html:18
+#: part/templates/part/detail.html:254
 #: templates/InvenTree/settings/category.html:29
 #: templates/InvenTree/settings/part.html:65
 msgid "New Parameter"
@@ -2485,12 +2483,12 @@ msgid "Delete parameters"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:80
-#: part/templates/part/params.html:57
+#: part/templates/part/detail.html:316
 msgid "Add Parameter"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:97
-#: part/templates/part/supplier.html:51
+#: part/templates/part/supplier.html:81
 msgid "Create new supplier"
 msgstr ""
 
@@ -2512,7 +2510,7 @@ msgstr ""
 msgid "Supplied Parts"
 msgstr ""
 
-#: company/templates/company/navbar.html:38 part/templates/part/navbar.html:36
+#: company/templates/company/navbar.html:38 part/templates/part/navbar.html:30
 #: stock/templates/stock/location.html:107
 #: stock/templates/stock/location.html:122
 #: stock/templates/stock/location.html:136
@@ -2529,7 +2527,7 @@ msgstr ""
 #: company/templates/company/sales_orders.html:11
 #: order/templates/order/sales_orders.html:8
 #: order/templates/order/sales_orders.html:13
-#: part/templates/part/navbar.html:101 part/templates/part/navbar.html:104
+#: part/templates/part/navbar.html:89 part/templates/part/navbar.html:92
 #: part/templates/part/sales_orders.html:10 templates/InvenTree/index.html:236
 #: templates/InvenTree/search.html:345
 #: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:46
@@ -2541,7 +2539,7 @@ msgstr ""
 #: company/templates/company/purchase_orders.html:10
 #: order/templates/order/purchase_orders.html:8
 #: order/templates/order/purchase_orders.html:13
-#: part/templates/part/navbar.html:93 part/templates/part/navbar.html:96
+#: part/templates/part/navbar.html:81 part/templates/part/navbar.html:84
 #: part/templates/part/orders.html:10 templates/InvenTree/index.html:213
 #: templates/InvenTree/search.html:325
 #: templates/InvenTree/settings/tabs.html:37 templates/navbar.html:37
@@ -2621,7 +2619,7 @@ msgid "Order Part"
 msgstr ""
 
 #: company/templates/company/supplier_part_pricing.html:11
-#: part/templates/part/navbar.html:74
+#: part/templates/part/navbar.html:68
 msgid "Pricing Information"
 msgstr ""
 
@@ -2651,8 +2649,7 @@ msgstr ""
 msgid "Delete price break"
 msgstr ""
 
-#: company/views.py:65 part/templates/part/navbar.html:81
-#: part/templates/part/navbar.html:84 part/templates/part/prices.html:157
+#: company/views.py:65 part/templates/part/prices.html:157
 #: templates/InvenTree/search.html:306 templates/navbar.html:36
 msgid "Manufacturers"
 msgstr ""
@@ -4201,8 +4198,8 @@ msgstr ""
 msgid "Part Attachments"
 msgstr ""
 
-#: part/templates/part/bom.html:10 part/templates/part/navbar.html:51
-#: part/templates/part/navbar.html:54
+#: part/templates/part/bom.html:10 part/templates/part/navbar.html:45
+#: part/templates/part/navbar.html:48
 msgid "Bill of Materials"
 msgstr ""
 
@@ -4477,7 +4474,7 @@ msgid "Import Parts"
 msgstr ""
 
 #: part/templates/part/category_parametric.html:10
-#: part/templates/part/navbar.html:22 part/templates/part/params.html:10
+#: part/templates/part/detail.html:246
 msgid "Part Parameters"
 msgstr ""
 
@@ -4585,6 +4582,10 @@ msgstr ""
 msgid "Part is not active"
 msgstr ""
 
+#: part/templates/part/detail.html:253
+msgid "Add new parameter"
+msgstr ""
+
 #: part/templates/part/import_wizard/ajax_part_upload.html:29
 #: part/templates/part/import_wizard/part_upload.html:51
 msgid "Unsuffitient privileges."
@@ -4594,64 +4595,47 @@ msgstr ""
 msgid "Import Parts from File"
 msgstr ""
 
-#: part/templates/part/manufacturer.html:11
-msgid "Part Manufacturers"
-msgstr ""
-
-#: part/templates/part/manufacturer.html:24
-msgid "Delete manufacturer parts"
-msgstr ""
-
-#: part/templates/part/manufacturer.html:53
-#: part/templates/part/supplier.html:56
-msgid "Create new manufacturer"
-msgstr ""
-
-#: part/templates/part/navbar.html:29 part/templates/part/variants.html:11
+#: part/templates/part/navbar.html:23 part/templates/part/variants.html:11
 msgid "Part Variants"
 msgstr ""
 
-#: part/templates/part/navbar.html:32
+#: part/templates/part/navbar.html:26
 msgid "Variants"
 msgstr ""
 
-#: part/templates/part/navbar.html:43
+#: part/templates/part/navbar.html:37
 msgid "Allocated Stock"
 msgstr ""
 
-#: part/templates/part/navbar.html:46
+#: part/templates/part/navbar.html:40
 msgid "Allocations"
 msgstr ""
 
-#: part/templates/part/navbar.html:67 part/templates/part/navbar.html:70
+#: part/templates/part/navbar.html:61 part/templates/part/navbar.html:64
 msgid "Used In"
 msgstr ""
 
-#: part/templates/part/navbar.html:77
+#: part/templates/part/navbar.html:71
 msgid "Prices"
 msgstr ""
 
-#: part/templates/part/navbar.html:109 part/templates/part/part_tests.html:10
+#: part/templates/part/navbar.html:97 part/templates/part/part_tests.html:10
 msgid "Part Test Templates"
 msgstr ""
 
-#: part/templates/part/navbar.html:112 stock/templates/stock/item_base.html:426
-msgid "Tests"
+#: part/templates/part/navbar.html:100
+msgid "Test Templates"
 msgstr ""
 
-#: part/templates/part/navbar.html:117 part/templates/part/navbar.html:120
+#: part/templates/part/navbar.html:105 part/templates/part/navbar.html:108
 #: part/templates/part/related.html:10
 msgid "Related Parts"
 msgstr ""
 
-#: part/templates/part/navbar.html:130 part/templates/part/notes.html:12
+#: part/templates/part/navbar.html:118 part/templates/part/notes.html:12
 msgid "Part Notes"
 msgstr ""
 
-#: part/templates/part/params.html:17
-msgid "Add new parameter"
-msgstr ""
-
 #: part/templates/part/part_app_base.html:12
 msgid "Part List"
 msgstr ""
@@ -4979,10 +4963,22 @@ msgstr ""
 msgid "Low Stock"
 msgstr ""
 
-#: part/templates/part/supplier.html:10
+#: part/templates/part/supplier.html:11
 msgid "Part Suppliers"
 msgstr ""
 
+#: part/templates/part/supplier.html:39
+msgid "Part Manufacturers"
+msgstr ""
+
+#: part/templates/part/supplier.html:52
+msgid "Delete manufacturer parts"
+msgstr ""
+
+#: part/templates/part/supplier.html:86 part/templates/part/supplier.html:162
+msgid "Create new manufacturer"
+msgstr ""
+
 #: part/templates/part/track.html:10
 msgid "Part Tracking"
 msgstr ""
@@ -5787,6 +5783,10 @@ msgstr ""
 msgid "No stocktake performed"
 msgstr ""
 
+#: stock/templates/stock/item_base.html:426
+msgid "Tests"
+msgstr ""
+
 #: stock/templates/stock/item_base.html:511
 msgid "Edit Stock Status"
 msgstr ""
@@ -6265,7 +6265,8 @@ msgstr ""
 
 #: templates/InvenTree/settings/appearance.html:29
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
 "        Please select another color theme :)\n"
 "    "
@@ -7913,4 +7914,3 @@ msgstr ""
 #: users/models.py:193
 msgid "Permission to delete items"
 msgstr ""
-
diff --git a/InvenTree/locale/ja/LC_MESSAGES/django.po b/InvenTree/locale/ja/LC_MESSAGES/django.po
index 2b101d2130..67ba6e1eeb 100644
--- a/InvenTree/locale/ja/LC_MESSAGES/django.po
+++ b/InvenTree/locale/ja/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-09 05:10+0000\n"
+"POT-Creation-Date: 2021-07-09 06:58+0000\n"
 "PO-Revision-Date: 2021-07-09 05:51\n"
 "Last-Translator: \n"
 "Language-Team: Japanese\n"
@@ -603,8 +603,8 @@ msgstr ""
 #: build/models.py:110 build/templates/build/index.html:8
 #: build/templates/build/index.html:15 order/templates/order/so_builds.html:12
 #: order/templates/order/so_navbar.html:19
-#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:58
-#: part/templates/part/navbar.html:61 templates/InvenTree/index.html:191
+#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:52
+#: part/templates/part/navbar.html:55 templates/InvenTree/index.html:191
 #: templates/InvenTree/search.html:185
 #: templates/InvenTree/settings/tabs.html:34 users/models.py:44
 msgid "Build Orders"
@@ -783,7 +783,7 @@ msgstr ""
 #: order/templates/order/sales_order_detail.html:319
 #: order/templates/order/so_navbar.html:33
 #: order/templates/order/so_navbar.html:36 part/models.py:864
-#: part/templates/part/navbar.html:133
+#: part/templates/part/navbar.html:121
 #: report/templates/report/inventree_build_order_base.html:173
 #: stock/forms.py:140 stock/forms.py:284 stock/forms.py:316 stock/forms.py:344
 #: stock/models.py:536 stock/models.py:1678 stock/models.py:1784
@@ -935,8 +935,8 @@ msgstr ""
 #: build/templates/build/attachments.html:12
 #: build/templates/build/navbar.html:43 build/templates/build/navbar.html:46
 #: order/templates/order/po_navbar.html:35
-#: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:124
-#: part/templates/part/navbar.html:127 stock/templates/stock/navbar.html:47
+#: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:112
+#: part/templates/part/navbar.html:115 stock/templates/stock/navbar.html:47
 #: stock/templates/stock/navbar.html:50
 msgid "Attachments"
 msgstr ""
@@ -2286,7 +2286,7 @@ msgid "Create new manufacturer part"
 msgstr ""
 
 #: company/templates/company/detail_manufacturer_part.html:23
-#: part/templates/part/manufacturer.html:19
+#: part/templates/part/supplier.html:47
 msgid "New Manufacturer Part"
 msgstr ""
 
@@ -2294,9 +2294,8 @@ msgstr ""
 #: company/templates/company/detail_supplier_part.html:27
 #: company/templates/company/manufacturer_part_suppliers.html:20
 #: company/templates/company/manufacturer_part_suppliers.html:46
-#: part/templates/part/category.html:131
-#: part/templates/part/manufacturer.html:22
-#: part/templates/part/supplier.html:20
+#: part/templates/part/category.html:131 part/templates/part/supplier.html:21
+#: part/templates/part/supplier.html:50
 msgid "Options"
 msgstr ""
 
@@ -2329,8 +2328,8 @@ msgid "Create new Part"
 msgstr ""
 
 #: company/templates/company/detail_manufacturer_part.html:74
-#: company/views.py:66 part/templates/part/manufacturer.html:52
-#: part/templates/part/supplier.html:55
+#: company/views.py:66 part/templates/part/supplier.html:85
+#: part/templates/part/supplier.html:161
 msgid "New Manufacturer"
 msgstr ""
 
@@ -2363,14 +2362,14 @@ msgstr ""
 
 #: company/templates/company/detail_supplier_part.html:22
 #: company/templates/company/manufacturer_part_suppliers.html:17
-#: part/templates/part/part_base.html:432 part/templates/part/supplier.html:17
+#: part/templates/part/part_base.html:432 part/templates/part/supplier.html:18
 #: templates/js/stock.js:1341
 msgid "New Supplier Part"
 msgstr ""
 
 #: company/templates/company/detail_supplier_part.html:72
 #: company/templates/company/manufacturer_part_suppliers.html:96
-#: company/views.py:60 part/templates/part/supplier.html:50
+#: company/views.py:60 part/templates/part/supplier.html:80
 msgid "New Supplier"
 msgstr ""
 
@@ -2419,8 +2418,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part_navbar.html:14
 #: company/templates/company/manufacturer_part_suppliers.html:10
-#: company/views.py:59 part/templates/part/navbar.html:87
-#: part/templates/part/navbar.html:90 part/templates/part/prices.html:153
+#: company/views.py:59 part/templates/part/navbar.html:75
+#: part/templates/part/navbar.html:78 part/templates/part/prices.html:153
 #: templates/InvenTree/search.html:316 templates/navbar.html:35
 msgid "Suppliers"
 msgstr ""
@@ -2432,7 +2431,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part_navbar.html:22
 #: company/templates/company/navbar.html:41
 #: company/templates/company/supplier_part_navbar.html:15
-#: part/templates/part/navbar.html:39 stock/api.py:53
+#: part/templates/part/navbar.html:33 stock/api.py:53
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:128 templates/InvenTree/search.html:196
@@ -2453,15 +2452,15 @@ msgid "Orders"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:22
-#: part/templates/part/supplier.html:22
+#: part/templates/part/supplier.html:23
 msgid "Delete supplier parts"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:22
 #: company/templates/company/manufacturer_part_suppliers.html:48
 #: company/templates/company/manufacturer_part_suppliers.html:142
-#: part/templates/part/manufacturer.html:24 part/templates/part/related.html:44
-#: part/templates/part/supplier.html:22 stock/views.py:844
+#: part/templates/part/related.html:44 part/templates/part/supplier.html:23
+#: part/templates/part/supplier.html:52 stock/views.py:844
 #: templates/js/company.js:203 users/models.py:193
 msgid "Delete"
 msgstr ""
@@ -2469,12 +2468,11 @@ msgstr ""
 #: company/templates/company/manufacturer_part_suppliers.html:37
 #: part/templates/part/category_navbar.html:46
 #: part/templates/part/category_navbar.html:49
-#: part/templates/part/navbar.html:25
 msgid "Parameters"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:43
-#: part/templates/part/params.html:18
+#: part/templates/part/detail.html:254
 #: templates/InvenTree/settings/category.html:29
 #: templates/InvenTree/settings/part.html:65
 msgid "New Parameter"
@@ -2485,12 +2483,12 @@ msgid "Delete parameters"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:80
-#: part/templates/part/params.html:57
+#: part/templates/part/detail.html:316
 msgid "Add Parameter"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:97
-#: part/templates/part/supplier.html:51
+#: part/templates/part/supplier.html:81
 msgid "Create new supplier"
 msgstr ""
 
@@ -2512,7 +2510,7 @@ msgstr ""
 msgid "Supplied Parts"
 msgstr ""
 
-#: company/templates/company/navbar.html:38 part/templates/part/navbar.html:36
+#: company/templates/company/navbar.html:38 part/templates/part/navbar.html:30
 #: stock/templates/stock/location.html:107
 #: stock/templates/stock/location.html:122
 #: stock/templates/stock/location.html:136
@@ -2529,7 +2527,7 @@ msgstr ""
 #: company/templates/company/sales_orders.html:11
 #: order/templates/order/sales_orders.html:8
 #: order/templates/order/sales_orders.html:13
-#: part/templates/part/navbar.html:101 part/templates/part/navbar.html:104
+#: part/templates/part/navbar.html:89 part/templates/part/navbar.html:92
 #: part/templates/part/sales_orders.html:10 templates/InvenTree/index.html:236
 #: templates/InvenTree/search.html:345
 #: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:46
@@ -2541,7 +2539,7 @@ msgstr ""
 #: company/templates/company/purchase_orders.html:10
 #: order/templates/order/purchase_orders.html:8
 #: order/templates/order/purchase_orders.html:13
-#: part/templates/part/navbar.html:93 part/templates/part/navbar.html:96
+#: part/templates/part/navbar.html:81 part/templates/part/navbar.html:84
 #: part/templates/part/orders.html:10 templates/InvenTree/index.html:213
 #: templates/InvenTree/search.html:325
 #: templates/InvenTree/settings/tabs.html:37 templates/navbar.html:37
@@ -2621,7 +2619,7 @@ msgid "Order Part"
 msgstr ""
 
 #: company/templates/company/supplier_part_pricing.html:11
-#: part/templates/part/navbar.html:74
+#: part/templates/part/navbar.html:68
 msgid "Pricing Information"
 msgstr ""
 
@@ -2651,8 +2649,7 @@ msgstr ""
 msgid "Delete price break"
 msgstr ""
 
-#: company/views.py:65 part/templates/part/navbar.html:81
-#: part/templates/part/navbar.html:84 part/templates/part/prices.html:157
+#: company/views.py:65 part/templates/part/prices.html:157
 #: templates/InvenTree/search.html:306 templates/navbar.html:36
 msgid "Manufacturers"
 msgstr ""
@@ -4201,8 +4198,8 @@ msgstr ""
 msgid "Part Attachments"
 msgstr ""
 
-#: part/templates/part/bom.html:10 part/templates/part/navbar.html:51
-#: part/templates/part/navbar.html:54
+#: part/templates/part/bom.html:10 part/templates/part/navbar.html:45
+#: part/templates/part/navbar.html:48
 msgid "Bill of Materials"
 msgstr ""
 
@@ -4477,7 +4474,7 @@ msgid "Import Parts"
 msgstr ""
 
 #: part/templates/part/category_parametric.html:10
-#: part/templates/part/navbar.html:22 part/templates/part/params.html:10
+#: part/templates/part/detail.html:246
 msgid "Part Parameters"
 msgstr ""
 
@@ -4585,6 +4582,10 @@ msgstr ""
 msgid "Part is not active"
 msgstr ""
 
+#: part/templates/part/detail.html:253
+msgid "Add new parameter"
+msgstr ""
+
 #: part/templates/part/import_wizard/ajax_part_upload.html:29
 #: part/templates/part/import_wizard/part_upload.html:51
 msgid "Unsuffitient privileges."
@@ -4594,64 +4595,47 @@ msgstr ""
 msgid "Import Parts from File"
 msgstr ""
 
-#: part/templates/part/manufacturer.html:11
-msgid "Part Manufacturers"
-msgstr ""
-
-#: part/templates/part/manufacturer.html:24
-msgid "Delete manufacturer parts"
-msgstr ""
-
-#: part/templates/part/manufacturer.html:53
-#: part/templates/part/supplier.html:56
-msgid "Create new manufacturer"
-msgstr ""
-
-#: part/templates/part/navbar.html:29 part/templates/part/variants.html:11
+#: part/templates/part/navbar.html:23 part/templates/part/variants.html:11
 msgid "Part Variants"
 msgstr ""
 
-#: part/templates/part/navbar.html:32
+#: part/templates/part/navbar.html:26
 msgid "Variants"
 msgstr ""
 
-#: part/templates/part/navbar.html:43
+#: part/templates/part/navbar.html:37
 msgid "Allocated Stock"
 msgstr ""
 
-#: part/templates/part/navbar.html:46
+#: part/templates/part/navbar.html:40
 msgid "Allocations"
 msgstr ""
 
-#: part/templates/part/navbar.html:67 part/templates/part/navbar.html:70
+#: part/templates/part/navbar.html:61 part/templates/part/navbar.html:64
 msgid "Used In"
 msgstr ""
 
-#: part/templates/part/navbar.html:77
+#: part/templates/part/navbar.html:71
 msgid "Prices"
 msgstr ""
 
-#: part/templates/part/navbar.html:109 part/templates/part/part_tests.html:10
+#: part/templates/part/navbar.html:97 part/templates/part/part_tests.html:10
 msgid "Part Test Templates"
 msgstr ""
 
-#: part/templates/part/navbar.html:112 stock/templates/stock/item_base.html:426
-msgid "Tests"
+#: part/templates/part/navbar.html:100
+msgid "Test Templates"
 msgstr ""
 
-#: part/templates/part/navbar.html:117 part/templates/part/navbar.html:120
+#: part/templates/part/navbar.html:105 part/templates/part/navbar.html:108
 #: part/templates/part/related.html:10
 msgid "Related Parts"
 msgstr ""
 
-#: part/templates/part/navbar.html:130 part/templates/part/notes.html:12
+#: part/templates/part/navbar.html:118 part/templates/part/notes.html:12
 msgid "Part Notes"
 msgstr ""
 
-#: part/templates/part/params.html:17
-msgid "Add new parameter"
-msgstr ""
-
 #: part/templates/part/part_app_base.html:12
 msgid "Part List"
 msgstr ""
@@ -4979,10 +4963,22 @@ msgstr ""
 msgid "Low Stock"
 msgstr ""
 
-#: part/templates/part/supplier.html:10
+#: part/templates/part/supplier.html:11
 msgid "Part Suppliers"
 msgstr ""
 
+#: part/templates/part/supplier.html:39
+msgid "Part Manufacturers"
+msgstr ""
+
+#: part/templates/part/supplier.html:52
+msgid "Delete manufacturer parts"
+msgstr ""
+
+#: part/templates/part/supplier.html:86 part/templates/part/supplier.html:162
+msgid "Create new manufacturer"
+msgstr ""
+
 #: part/templates/part/track.html:10
 msgid "Part Tracking"
 msgstr ""
@@ -5787,6 +5783,10 @@ msgstr ""
 msgid "No stocktake performed"
 msgstr ""
 
+#: stock/templates/stock/item_base.html:426
+msgid "Tests"
+msgstr ""
+
 #: stock/templates/stock/item_base.html:511
 msgid "Edit Stock Status"
 msgstr ""
@@ -6265,7 +6265,8 @@ msgstr ""
 
 #: templates/InvenTree/settings/appearance.html:29
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
 "        Please select another color theme :)\n"
 "    "
@@ -7913,4 +7914,3 @@ msgstr ""
 #: users/models.py:193
 msgid "Permission to delete items"
 msgstr ""
-
diff --git a/InvenTree/locale/pl/LC_MESSAGES/django.po b/InvenTree/locale/pl/LC_MESSAGES/django.po
index 79acf1b390..cb67c99ceb 100644
--- a/InvenTree/locale/pl/LC_MESSAGES/django.po
+++ b/InvenTree/locale/pl/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-09 05:10+0000\n"
+"POT-Creation-Date: 2021-07-09 06:58+0000\n"
 "PO-Revision-Date: 2021-07-09 05:51\n"
 "Last-Translator: \n"
 "Language-Team: Polish\n"
@@ -603,8 +603,8 @@ msgstr "Zlecenie Budowy"
 #: build/models.py:110 build/templates/build/index.html:8
 #: build/templates/build/index.html:15 order/templates/order/so_builds.html:12
 #: order/templates/order/so_navbar.html:19
-#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:58
-#: part/templates/part/navbar.html:61 templates/InvenTree/index.html:191
+#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:52
+#: part/templates/part/navbar.html:55 templates/InvenTree/index.html:191
 #: templates/InvenTree/search.html:185
 #: templates/InvenTree/settings/tabs.html:34 users/models.py:44
 msgid "Build Orders"
@@ -783,7 +783,7 @@ msgstr "Link do zewnętrznego adresu URL"
 #: order/templates/order/sales_order_detail.html:319
 #: order/templates/order/so_navbar.html:33
 #: order/templates/order/so_navbar.html:36 part/models.py:864
-#: part/templates/part/navbar.html:133
+#: part/templates/part/navbar.html:121
 #: report/templates/report/inventree_build_order_base.html:173
 #: stock/forms.py:140 stock/forms.py:284 stock/forms.py:316 stock/forms.py:344
 #: stock/models.py:536 stock/models.py:1678 stock/models.py:1784
@@ -935,8 +935,8 @@ msgstr "Numer Seryjny"
 #: build/templates/build/attachments.html:12
 #: build/templates/build/navbar.html:43 build/templates/build/navbar.html:46
 #: order/templates/order/po_navbar.html:35
-#: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:124
-#: part/templates/part/navbar.html:127 stock/templates/stock/navbar.html:47
+#: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:112
+#: part/templates/part/navbar.html:115 stock/templates/stock/navbar.html:47
 #: stock/templates/stock/navbar.html:50
 msgid "Attachments"
 msgstr "Załączniki"
@@ -2286,7 +2286,7 @@ msgid "Create new manufacturer part"
 msgstr "Utwórz nową część producenta"
 
 #: company/templates/company/detail_manufacturer_part.html:23
-#: part/templates/part/manufacturer.html:19
+#: part/templates/part/supplier.html:47
 msgid "New Manufacturer Part"
 msgstr "Nowa część producenta"
 
@@ -2294,9 +2294,8 @@ msgstr "Nowa część producenta"
 #: company/templates/company/detail_supplier_part.html:27
 #: company/templates/company/manufacturer_part_suppliers.html:20
 #: company/templates/company/manufacturer_part_suppliers.html:46
-#: part/templates/part/category.html:131
-#: part/templates/part/manufacturer.html:22
-#: part/templates/part/supplier.html:20
+#: part/templates/part/category.html:131 part/templates/part/supplier.html:21
+#: part/templates/part/supplier.html:50
 msgid "Options"
 msgstr "Opcje"
 
@@ -2329,8 +2328,8 @@ msgid "Create new Part"
 msgstr "Utwórz nowy komponent"
 
 #: company/templates/company/detail_manufacturer_part.html:74
-#: company/views.py:66 part/templates/part/manufacturer.html:52
-#: part/templates/part/supplier.html:55
+#: company/views.py:66 part/templates/part/supplier.html:85
+#: part/templates/part/supplier.html:161
 msgid "New Manufacturer"
 msgstr "Now producent"
 
@@ -2363,14 +2362,14 @@ msgstr "Utwórz nowego dostawcę części"
 
 #: company/templates/company/detail_supplier_part.html:22
 #: company/templates/company/manufacturer_part_suppliers.html:17
-#: part/templates/part/part_base.html:432 part/templates/part/supplier.html:17
+#: part/templates/part/part_base.html:432 part/templates/part/supplier.html:18
 #: templates/js/stock.js:1341
 msgid "New Supplier Part"
 msgstr "Now dostawca części"
 
 #: company/templates/company/detail_supplier_part.html:72
 #: company/templates/company/manufacturer_part_suppliers.html:96
-#: company/views.py:60 part/templates/part/supplier.html:50
+#: company/views.py:60 part/templates/part/supplier.html:80
 msgid "New Supplier"
 msgstr "Nowy dostawca"
 
@@ -2419,8 +2418,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part_navbar.html:14
 #: company/templates/company/manufacturer_part_suppliers.html:10
-#: company/views.py:59 part/templates/part/navbar.html:87
-#: part/templates/part/navbar.html:90 part/templates/part/prices.html:153
+#: company/views.py:59 part/templates/part/navbar.html:75
+#: part/templates/part/navbar.html:78 part/templates/part/prices.html:153
 #: templates/InvenTree/search.html:316 templates/navbar.html:35
 msgid "Suppliers"
 msgstr "Dostawcy"
@@ -2432,7 +2431,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part_navbar.html:22
 #: company/templates/company/navbar.html:41
 #: company/templates/company/supplier_part_navbar.html:15
-#: part/templates/part/navbar.html:39 stock/api.py:53
+#: part/templates/part/navbar.html:33 stock/api.py:53
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:128 templates/InvenTree/search.html:196
@@ -2453,15 +2452,15 @@ msgid "Orders"
 msgstr "Zamówienia"
 
 #: company/templates/company/manufacturer_part_suppliers.html:22
-#: part/templates/part/supplier.html:22
+#: part/templates/part/supplier.html:23
 msgid "Delete supplier parts"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:22
 #: company/templates/company/manufacturer_part_suppliers.html:48
 #: company/templates/company/manufacturer_part_suppliers.html:142
-#: part/templates/part/manufacturer.html:24 part/templates/part/related.html:44
-#: part/templates/part/supplier.html:22 stock/views.py:844
+#: part/templates/part/related.html:44 part/templates/part/supplier.html:23
+#: part/templates/part/supplier.html:52 stock/views.py:844
 #: templates/js/company.js:203 users/models.py:193
 msgid "Delete"
 msgstr "Usuń"
@@ -2469,12 +2468,11 @@ msgstr "Usuń"
 #: company/templates/company/manufacturer_part_suppliers.html:37
 #: part/templates/part/category_navbar.html:46
 #: part/templates/part/category_navbar.html:49
-#: part/templates/part/navbar.html:25
 msgid "Parameters"
 msgstr "Parametry"
 
 #: company/templates/company/manufacturer_part_suppliers.html:43
-#: part/templates/part/params.html:18
+#: part/templates/part/detail.html:254
 #: templates/InvenTree/settings/category.html:29
 #: templates/InvenTree/settings/part.html:65
 msgid "New Parameter"
@@ -2485,12 +2483,12 @@ msgid "Delete parameters"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:80
-#: part/templates/part/params.html:57
+#: part/templates/part/detail.html:316
 msgid "Add Parameter"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:97
-#: part/templates/part/supplier.html:51
+#: part/templates/part/supplier.html:81
 msgid "Create new supplier"
 msgstr "Utwórz nowego dostawcę"
 
@@ -2512,7 +2510,7 @@ msgstr ""
 msgid "Supplied Parts"
 msgstr "Dostarczone części"
 
-#: company/templates/company/navbar.html:38 part/templates/part/navbar.html:36
+#: company/templates/company/navbar.html:38 part/templates/part/navbar.html:30
 #: stock/templates/stock/location.html:107
 #: stock/templates/stock/location.html:122
 #: stock/templates/stock/location.html:136
@@ -2529,7 +2527,7 @@ msgstr ""
 #: company/templates/company/sales_orders.html:11
 #: order/templates/order/sales_orders.html:8
 #: order/templates/order/sales_orders.html:13
-#: part/templates/part/navbar.html:101 part/templates/part/navbar.html:104
+#: part/templates/part/navbar.html:89 part/templates/part/navbar.html:92
 #: part/templates/part/sales_orders.html:10 templates/InvenTree/index.html:236
 #: templates/InvenTree/search.html:345
 #: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:46
@@ -2541,7 +2539,7 @@ msgstr ""
 #: company/templates/company/purchase_orders.html:10
 #: order/templates/order/purchase_orders.html:8
 #: order/templates/order/purchase_orders.html:13
-#: part/templates/part/navbar.html:93 part/templates/part/navbar.html:96
+#: part/templates/part/navbar.html:81 part/templates/part/navbar.html:84
 #: part/templates/part/orders.html:10 templates/InvenTree/index.html:213
 #: templates/InvenTree/search.html:325
 #: templates/InvenTree/settings/tabs.html:37 templates/navbar.html:37
@@ -2621,7 +2619,7 @@ msgid "Order Part"
 msgstr ""
 
 #: company/templates/company/supplier_part_pricing.html:11
-#: part/templates/part/navbar.html:74
+#: part/templates/part/navbar.html:68
 msgid "Pricing Information"
 msgstr "Informacja cenowa"
 
@@ -2651,8 +2649,7 @@ msgstr "Edytuj przedział cenowy"
 msgid "Delete price break"
 msgstr ""
 
-#: company/views.py:65 part/templates/part/navbar.html:81
-#: part/templates/part/navbar.html:84 part/templates/part/prices.html:157
+#: company/views.py:65 part/templates/part/prices.html:157
 #: templates/InvenTree/search.html:306 templates/navbar.html:36
 msgid "Manufacturers"
 msgstr "Producenci"
@@ -4201,8 +4198,8 @@ msgstr ""
 msgid "Part Attachments"
 msgstr ""
 
-#: part/templates/part/bom.html:10 part/templates/part/navbar.html:51
-#: part/templates/part/navbar.html:54
+#: part/templates/part/bom.html:10 part/templates/part/navbar.html:45
+#: part/templates/part/navbar.html:48
 msgid "Bill of Materials"
 msgstr "Zestawienie materiałowe"
 
@@ -4477,7 +4474,7 @@ msgid "Import Parts"
 msgstr ""
 
 #: part/templates/part/category_parametric.html:10
-#: part/templates/part/navbar.html:22 part/templates/part/params.html:10
+#: part/templates/part/detail.html:246
 msgid "Part Parameters"
 msgstr "Parametry części"
 
@@ -4585,6 +4582,10 @@ msgstr ""
 msgid "Part is not active"
 msgstr ""
 
+#: part/templates/part/detail.html:253
+msgid "Add new parameter"
+msgstr ""
+
 #: part/templates/part/import_wizard/ajax_part_upload.html:29
 #: part/templates/part/import_wizard/part_upload.html:51
 msgid "Unsuffitient privileges."
@@ -4594,64 +4595,49 @@ msgstr ""
 msgid "Import Parts from File"
 msgstr ""
 
-#: part/templates/part/manufacturer.html:11
-msgid "Part Manufacturers"
-msgstr ""
-
-#: part/templates/part/manufacturer.html:24
-msgid "Delete manufacturer parts"
-msgstr ""
-
-#: part/templates/part/manufacturer.html:53
-#: part/templates/part/supplier.html:56
-msgid "Create new manufacturer"
-msgstr ""
-
-#: part/templates/part/navbar.html:29 part/templates/part/variants.html:11
+#: part/templates/part/navbar.html:23 part/templates/part/variants.html:11
 msgid "Part Variants"
 msgstr ""
 
-#: part/templates/part/navbar.html:32
+#: part/templates/part/navbar.html:26
 msgid "Variants"
 msgstr ""
 
-#: part/templates/part/navbar.html:43
+#: part/templates/part/navbar.html:37
 msgid "Allocated Stock"
 msgstr ""
 
-#: part/templates/part/navbar.html:46
+#: part/templates/part/navbar.html:40
 msgid "Allocations"
 msgstr ""
 
-#: part/templates/part/navbar.html:67 part/templates/part/navbar.html:70
+#: part/templates/part/navbar.html:61 part/templates/part/navbar.html:64
 msgid "Used In"
 msgstr ""
 
-#: part/templates/part/navbar.html:77
+#: part/templates/part/navbar.html:71
 msgid "Prices"
 msgstr ""
 
-#: part/templates/part/navbar.html:109 part/templates/part/part_tests.html:10
+#: part/templates/part/navbar.html:97 part/templates/part/part_tests.html:10
 msgid "Part Test Templates"
 msgstr ""
 
-#: part/templates/part/navbar.html:112 stock/templates/stock/item_base.html:426
-msgid "Tests"
-msgstr ""
+#: part/templates/part/navbar.html:100
+#, fuzzy
+#| msgid "Template"
+msgid "Test Templates"
+msgstr "Szablon"
 
-#: part/templates/part/navbar.html:117 part/templates/part/navbar.html:120
+#: part/templates/part/navbar.html:105 part/templates/part/navbar.html:108
 #: part/templates/part/related.html:10
 msgid "Related Parts"
 msgstr ""
 
-#: part/templates/part/navbar.html:130 part/templates/part/notes.html:12
+#: part/templates/part/navbar.html:118 part/templates/part/notes.html:12
 msgid "Part Notes"
 msgstr ""
 
-#: part/templates/part/params.html:17
-msgid "Add new parameter"
-msgstr ""
-
 #: part/templates/part/part_app_base.html:12
 msgid "Part List"
 msgstr ""
@@ -4979,10 +4965,22 @@ msgstr ""
 msgid "Low Stock"
 msgstr ""
 
-#: part/templates/part/supplier.html:10
+#: part/templates/part/supplier.html:11
 msgid "Part Suppliers"
 msgstr ""
 
+#: part/templates/part/supplier.html:39
+msgid "Part Manufacturers"
+msgstr ""
+
+#: part/templates/part/supplier.html:52
+msgid "Delete manufacturer parts"
+msgstr ""
+
+#: part/templates/part/supplier.html:86 part/templates/part/supplier.html:162
+msgid "Create new manufacturer"
+msgstr ""
+
 #: part/templates/part/track.html:10
 msgid "Part Tracking"
 msgstr ""
@@ -5787,6 +5785,10 @@ msgstr ""
 msgid "No stocktake performed"
 msgstr ""
 
+#: stock/templates/stock/item_base.html:426
+msgid "Tests"
+msgstr ""
+
 #: stock/templates/stock/item_base.html:511
 msgid "Edit Stock Status"
 msgstr ""
@@ -6265,7 +6267,8 @@ msgstr ""
 
 #: templates/InvenTree/settings/appearance.html:29
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
 "        Please select another color theme :)\n"
 "    "
@@ -7913,4 +7916,3 @@ msgstr ""
 #: users/models.py:193
 msgid "Permission to delete items"
 msgstr ""
-
diff --git a/InvenTree/locale/ru/LC_MESSAGES/django.po b/InvenTree/locale/ru/LC_MESSAGES/django.po
index b767441b3e..3042166a52 100644
--- a/InvenTree/locale/ru/LC_MESSAGES/django.po
+++ b/InvenTree/locale/ru/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-09 05:10+0000\n"
+"POT-Creation-Date: 2021-07-09 06:58+0000\n"
 "PO-Revision-Date: 2021-07-09 05:51\n"
 "Last-Translator: \n"
 "Language-Team: Russian\n"
@@ -603,8 +603,8 @@ msgstr "Порядок сборки"
 #: build/models.py:110 build/templates/build/index.html:8
 #: build/templates/build/index.html:15 order/templates/order/so_builds.html:12
 #: order/templates/order/so_navbar.html:19
-#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:58
-#: part/templates/part/navbar.html:61 templates/InvenTree/index.html:191
+#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:52
+#: part/templates/part/navbar.html:55 templates/InvenTree/index.html:191
 #: templates/InvenTree/search.html:185
 #: templates/InvenTree/settings/tabs.html:34 users/models.py:44
 msgid "Build Orders"
@@ -783,7 +783,7 @@ msgstr ""
 #: order/templates/order/sales_order_detail.html:319
 #: order/templates/order/so_navbar.html:33
 #: order/templates/order/so_navbar.html:36 part/models.py:864
-#: part/templates/part/navbar.html:133
+#: part/templates/part/navbar.html:121
 #: report/templates/report/inventree_build_order_base.html:173
 #: stock/forms.py:140 stock/forms.py:284 stock/forms.py:316 stock/forms.py:344
 #: stock/models.py:536 stock/models.py:1678 stock/models.py:1784
@@ -935,8 +935,8 @@ msgstr ""
 #: build/templates/build/attachments.html:12
 #: build/templates/build/navbar.html:43 build/templates/build/navbar.html:46
 #: order/templates/order/po_navbar.html:35
-#: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:124
-#: part/templates/part/navbar.html:127 stock/templates/stock/navbar.html:47
+#: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:112
+#: part/templates/part/navbar.html:115 stock/templates/stock/navbar.html:47
 #: stock/templates/stock/navbar.html:50
 msgid "Attachments"
 msgstr ""
@@ -2286,7 +2286,7 @@ msgid "Create new manufacturer part"
 msgstr ""
 
 #: company/templates/company/detail_manufacturer_part.html:23
-#: part/templates/part/manufacturer.html:19
+#: part/templates/part/supplier.html:47
 msgid "New Manufacturer Part"
 msgstr ""
 
@@ -2294,9 +2294,8 @@ msgstr ""
 #: company/templates/company/detail_supplier_part.html:27
 #: company/templates/company/manufacturer_part_suppliers.html:20
 #: company/templates/company/manufacturer_part_suppliers.html:46
-#: part/templates/part/category.html:131
-#: part/templates/part/manufacturer.html:22
-#: part/templates/part/supplier.html:20
+#: part/templates/part/category.html:131 part/templates/part/supplier.html:21
+#: part/templates/part/supplier.html:50
 msgid "Options"
 msgstr ""
 
@@ -2329,8 +2328,8 @@ msgid "Create new Part"
 msgstr ""
 
 #: company/templates/company/detail_manufacturer_part.html:74
-#: company/views.py:66 part/templates/part/manufacturer.html:52
-#: part/templates/part/supplier.html:55
+#: company/views.py:66 part/templates/part/supplier.html:85
+#: part/templates/part/supplier.html:161
 msgid "New Manufacturer"
 msgstr ""
 
@@ -2363,14 +2362,14 @@ msgstr ""
 
 #: company/templates/company/detail_supplier_part.html:22
 #: company/templates/company/manufacturer_part_suppliers.html:17
-#: part/templates/part/part_base.html:432 part/templates/part/supplier.html:17
+#: part/templates/part/part_base.html:432 part/templates/part/supplier.html:18
 #: templates/js/stock.js:1341
 msgid "New Supplier Part"
 msgstr ""
 
 #: company/templates/company/detail_supplier_part.html:72
 #: company/templates/company/manufacturer_part_suppliers.html:96
-#: company/views.py:60 part/templates/part/supplier.html:50
+#: company/views.py:60 part/templates/part/supplier.html:80
 msgid "New Supplier"
 msgstr ""
 
@@ -2419,8 +2418,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part_navbar.html:14
 #: company/templates/company/manufacturer_part_suppliers.html:10
-#: company/views.py:59 part/templates/part/navbar.html:87
-#: part/templates/part/navbar.html:90 part/templates/part/prices.html:153
+#: company/views.py:59 part/templates/part/navbar.html:75
+#: part/templates/part/navbar.html:78 part/templates/part/prices.html:153
 #: templates/InvenTree/search.html:316 templates/navbar.html:35
 msgid "Suppliers"
 msgstr ""
@@ -2432,7 +2431,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part_navbar.html:22
 #: company/templates/company/navbar.html:41
 #: company/templates/company/supplier_part_navbar.html:15
-#: part/templates/part/navbar.html:39 stock/api.py:53
+#: part/templates/part/navbar.html:33 stock/api.py:53
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:128 templates/InvenTree/search.html:196
@@ -2453,15 +2452,15 @@ msgid "Orders"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:22
-#: part/templates/part/supplier.html:22
+#: part/templates/part/supplier.html:23
 msgid "Delete supplier parts"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:22
 #: company/templates/company/manufacturer_part_suppliers.html:48
 #: company/templates/company/manufacturer_part_suppliers.html:142
-#: part/templates/part/manufacturer.html:24 part/templates/part/related.html:44
-#: part/templates/part/supplier.html:22 stock/views.py:844
+#: part/templates/part/related.html:44 part/templates/part/supplier.html:23
+#: part/templates/part/supplier.html:52 stock/views.py:844
 #: templates/js/company.js:203 users/models.py:193
 msgid "Delete"
 msgstr ""
@@ -2469,12 +2468,11 @@ msgstr ""
 #: company/templates/company/manufacturer_part_suppliers.html:37
 #: part/templates/part/category_navbar.html:46
 #: part/templates/part/category_navbar.html:49
-#: part/templates/part/navbar.html:25
 msgid "Parameters"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:43
-#: part/templates/part/params.html:18
+#: part/templates/part/detail.html:254
 #: templates/InvenTree/settings/category.html:29
 #: templates/InvenTree/settings/part.html:65
 msgid "New Parameter"
@@ -2485,12 +2483,12 @@ msgid "Delete parameters"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:80
-#: part/templates/part/params.html:57
+#: part/templates/part/detail.html:316
 msgid "Add Parameter"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:97
-#: part/templates/part/supplier.html:51
+#: part/templates/part/supplier.html:81
 msgid "Create new supplier"
 msgstr ""
 
@@ -2512,7 +2510,7 @@ msgstr ""
 msgid "Supplied Parts"
 msgstr ""
 
-#: company/templates/company/navbar.html:38 part/templates/part/navbar.html:36
+#: company/templates/company/navbar.html:38 part/templates/part/navbar.html:30
 #: stock/templates/stock/location.html:107
 #: stock/templates/stock/location.html:122
 #: stock/templates/stock/location.html:136
@@ -2529,7 +2527,7 @@ msgstr ""
 #: company/templates/company/sales_orders.html:11
 #: order/templates/order/sales_orders.html:8
 #: order/templates/order/sales_orders.html:13
-#: part/templates/part/navbar.html:101 part/templates/part/navbar.html:104
+#: part/templates/part/navbar.html:89 part/templates/part/navbar.html:92
 #: part/templates/part/sales_orders.html:10 templates/InvenTree/index.html:236
 #: templates/InvenTree/search.html:345
 #: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:46
@@ -2541,7 +2539,7 @@ msgstr ""
 #: company/templates/company/purchase_orders.html:10
 #: order/templates/order/purchase_orders.html:8
 #: order/templates/order/purchase_orders.html:13
-#: part/templates/part/navbar.html:93 part/templates/part/navbar.html:96
+#: part/templates/part/navbar.html:81 part/templates/part/navbar.html:84
 #: part/templates/part/orders.html:10 templates/InvenTree/index.html:213
 #: templates/InvenTree/search.html:325
 #: templates/InvenTree/settings/tabs.html:37 templates/navbar.html:37
@@ -2621,7 +2619,7 @@ msgid "Order Part"
 msgstr ""
 
 #: company/templates/company/supplier_part_pricing.html:11
-#: part/templates/part/navbar.html:74
+#: part/templates/part/navbar.html:68
 msgid "Pricing Information"
 msgstr ""
 
@@ -2651,8 +2649,7 @@ msgstr ""
 msgid "Delete price break"
 msgstr ""
 
-#: company/views.py:65 part/templates/part/navbar.html:81
-#: part/templates/part/navbar.html:84 part/templates/part/prices.html:157
+#: company/views.py:65 part/templates/part/prices.html:157
 #: templates/InvenTree/search.html:306 templates/navbar.html:36
 msgid "Manufacturers"
 msgstr ""
@@ -4201,8 +4198,8 @@ msgstr ""
 msgid "Part Attachments"
 msgstr ""
 
-#: part/templates/part/bom.html:10 part/templates/part/navbar.html:51
-#: part/templates/part/navbar.html:54
+#: part/templates/part/bom.html:10 part/templates/part/navbar.html:45
+#: part/templates/part/navbar.html:48
 msgid "Bill of Materials"
 msgstr ""
 
@@ -4477,7 +4474,7 @@ msgid "Import Parts"
 msgstr ""
 
 #: part/templates/part/category_parametric.html:10
-#: part/templates/part/navbar.html:22 part/templates/part/params.html:10
+#: part/templates/part/detail.html:246
 msgid "Part Parameters"
 msgstr ""
 
@@ -4585,6 +4582,10 @@ msgstr ""
 msgid "Part is not active"
 msgstr ""
 
+#: part/templates/part/detail.html:253
+msgid "Add new parameter"
+msgstr ""
+
 #: part/templates/part/import_wizard/ajax_part_upload.html:29
 #: part/templates/part/import_wizard/part_upload.html:51
 msgid "Unsuffitient privileges."
@@ -4594,64 +4595,47 @@ msgstr ""
 msgid "Import Parts from File"
 msgstr ""
 
-#: part/templates/part/manufacturer.html:11
-msgid "Part Manufacturers"
-msgstr ""
-
-#: part/templates/part/manufacturer.html:24
-msgid "Delete manufacturer parts"
-msgstr ""
-
-#: part/templates/part/manufacturer.html:53
-#: part/templates/part/supplier.html:56
-msgid "Create new manufacturer"
-msgstr ""
-
-#: part/templates/part/navbar.html:29 part/templates/part/variants.html:11
+#: part/templates/part/navbar.html:23 part/templates/part/variants.html:11
 msgid "Part Variants"
 msgstr ""
 
-#: part/templates/part/navbar.html:32
+#: part/templates/part/navbar.html:26
 msgid "Variants"
 msgstr ""
 
-#: part/templates/part/navbar.html:43
+#: part/templates/part/navbar.html:37
 msgid "Allocated Stock"
 msgstr ""
 
-#: part/templates/part/navbar.html:46
+#: part/templates/part/navbar.html:40
 msgid "Allocations"
 msgstr ""
 
-#: part/templates/part/navbar.html:67 part/templates/part/navbar.html:70
+#: part/templates/part/navbar.html:61 part/templates/part/navbar.html:64
 msgid "Used In"
 msgstr ""
 
-#: part/templates/part/navbar.html:77
+#: part/templates/part/navbar.html:71
 msgid "Prices"
 msgstr ""
 
-#: part/templates/part/navbar.html:109 part/templates/part/part_tests.html:10
+#: part/templates/part/navbar.html:97 part/templates/part/part_tests.html:10
 msgid "Part Test Templates"
 msgstr ""
 
-#: part/templates/part/navbar.html:112 stock/templates/stock/item_base.html:426
-msgid "Tests"
+#: part/templates/part/navbar.html:100
+msgid "Test Templates"
 msgstr ""
 
-#: part/templates/part/navbar.html:117 part/templates/part/navbar.html:120
+#: part/templates/part/navbar.html:105 part/templates/part/navbar.html:108
 #: part/templates/part/related.html:10
 msgid "Related Parts"
 msgstr ""
 
-#: part/templates/part/navbar.html:130 part/templates/part/notes.html:12
+#: part/templates/part/navbar.html:118 part/templates/part/notes.html:12
 msgid "Part Notes"
 msgstr ""
 
-#: part/templates/part/params.html:17
-msgid "Add new parameter"
-msgstr ""
-
 #: part/templates/part/part_app_base.html:12
 msgid "Part List"
 msgstr ""
@@ -4979,10 +4963,22 @@ msgstr ""
 msgid "Low Stock"
 msgstr ""
 
-#: part/templates/part/supplier.html:10
+#: part/templates/part/supplier.html:11
 msgid "Part Suppliers"
 msgstr ""
 
+#: part/templates/part/supplier.html:39
+msgid "Part Manufacturers"
+msgstr ""
+
+#: part/templates/part/supplier.html:52
+msgid "Delete manufacturer parts"
+msgstr ""
+
+#: part/templates/part/supplier.html:86 part/templates/part/supplier.html:162
+msgid "Create new manufacturer"
+msgstr ""
+
 #: part/templates/part/track.html:10
 msgid "Part Tracking"
 msgstr ""
@@ -5787,6 +5783,10 @@ msgstr ""
 msgid "No stocktake performed"
 msgstr ""
 
+#: stock/templates/stock/item_base.html:426
+msgid "Tests"
+msgstr ""
+
 #: stock/templates/stock/item_base.html:511
 msgid "Edit Stock Status"
 msgstr ""
@@ -6265,7 +6265,8 @@ msgstr ""
 
 #: templates/InvenTree/settings/appearance.html:29
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
 "        Please select another color theme :)\n"
 "    "
@@ -7913,4 +7914,3 @@ msgstr ""
 #: users/models.py:193
 msgid "Permission to delete items"
 msgstr ""
-
diff --git a/InvenTree/locale/tr/LC_MESSAGES/django.po b/InvenTree/locale/tr/LC_MESSAGES/django.po
index fd2efe70e2..9008f4f6ef 100644
--- a/InvenTree/locale/tr/LC_MESSAGES/django.po
+++ b/InvenTree/locale/tr/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-09 05:10+0000\n"
+"POT-Creation-Date: 2021-07-09 06:58+0000\n"
 "PO-Revision-Date: 2021-07-09 05:51\n"
 "Last-Translator: \n"
 "Language-Team: Turkish\n"
@@ -603,8 +603,8 @@ msgstr "Yapım İşi Emri"
 #: build/models.py:110 build/templates/build/index.html:8
 #: build/templates/build/index.html:15 order/templates/order/so_builds.html:12
 #: order/templates/order/so_navbar.html:19
-#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:58
-#: part/templates/part/navbar.html:61 templates/InvenTree/index.html:191
+#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:52
+#: part/templates/part/navbar.html:55 templates/InvenTree/index.html:191
 #: templates/InvenTree/search.html:185
 #: templates/InvenTree/settings/tabs.html:34 users/models.py:44
 msgid "Build Orders"
@@ -783,7 +783,7 @@ msgstr "Harici URL'ye bağlantı"
 #: order/templates/order/sales_order_detail.html:319
 #: order/templates/order/so_navbar.html:33
 #: order/templates/order/so_navbar.html:36 part/models.py:864
-#: part/templates/part/navbar.html:133
+#: part/templates/part/navbar.html:121
 #: report/templates/report/inventree_build_order_base.html:173
 #: stock/forms.py:140 stock/forms.py:284 stock/forms.py:316 stock/forms.py:344
 #: stock/models.py:536 stock/models.py:1678 stock/models.py:1784
@@ -935,8 +935,8 @@ msgstr "Seri Numara"
 #: build/templates/build/attachments.html:12
 #: build/templates/build/navbar.html:43 build/templates/build/navbar.html:46
 #: order/templates/order/po_navbar.html:35
-#: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:124
-#: part/templates/part/navbar.html:127 stock/templates/stock/navbar.html:47
+#: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:112
+#: part/templates/part/navbar.html:115 stock/templates/stock/navbar.html:47
 #: stock/templates/stock/navbar.html:50
 msgid "Attachments"
 msgstr "Ekler"
@@ -2286,7 +2286,7 @@ msgid "Create new manufacturer part"
 msgstr ""
 
 #: company/templates/company/detail_manufacturer_part.html:23
-#: part/templates/part/manufacturer.html:19
+#: part/templates/part/supplier.html:47
 msgid "New Manufacturer Part"
 msgstr ""
 
@@ -2294,9 +2294,8 @@ msgstr ""
 #: company/templates/company/detail_supplier_part.html:27
 #: company/templates/company/manufacturer_part_suppliers.html:20
 #: company/templates/company/manufacturer_part_suppliers.html:46
-#: part/templates/part/category.html:131
-#: part/templates/part/manufacturer.html:22
-#: part/templates/part/supplier.html:20
+#: part/templates/part/category.html:131 part/templates/part/supplier.html:21
+#: part/templates/part/supplier.html:50
 msgid "Options"
 msgstr ""
 
@@ -2329,8 +2328,8 @@ msgid "Create new Part"
 msgstr ""
 
 #: company/templates/company/detail_manufacturer_part.html:74
-#: company/views.py:66 part/templates/part/manufacturer.html:52
-#: part/templates/part/supplier.html:55
+#: company/views.py:66 part/templates/part/supplier.html:85
+#: part/templates/part/supplier.html:161
 msgid "New Manufacturer"
 msgstr ""
 
@@ -2363,14 +2362,14 @@ msgstr "Yeni tedarikçi parçası oluştur"
 
 #: company/templates/company/detail_supplier_part.html:22
 #: company/templates/company/manufacturer_part_suppliers.html:17
-#: part/templates/part/part_base.html:432 part/templates/part/supplier.html:17
+#: part/templates/part/part_base.html:432 part/templates/part/supplier.html:18
 #: templates/js/stock.js:1341
 msgid "New Supplier Part"
 msgstr "Yeni Tedarikçi Parçası"
 
 #: company/templates/company/detail_supplier_part.html:72
 #: company/templates/company/manufacturer_part_suppliers.html:96
-#: company/views.py:60 part/templates/part/supplier.html:50
+#: company/views.py:60 part/templates/part/supplier.html:80
 msgid "New Supplier"
 msgstr ""
 
@@ -2419,8 +2418,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part_navbar.html:14
 #: company/templates/company/manufacturer_part_suppliers.html:10
-#: company/views.py:59 part/templates/part/navbar.html:87
-#: part/templates/part/navbar.html:90 part/templates/part/prices.html:153
+#: company/views.py:59 part/templates/part/navbar.html:75
+#: part/templates/part/navbar.html:78 part/templates/part/prices.html:153
 #: templates/InvenTree/search.html:316 templates/navbar.html:35
 msgid "Suppliers"
 msgstr ""
@@ -2432,7 +2431,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part_navbar.html:22
 #: company/templates/company/navbar.html:41
 #: company/templates/company/supplier_part_navbar.html:15
-#: part/templates/part/navbar.html:39 stock/api.py:53
+#: part/templates/part/navbar.html:33 stock/api.py:53
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:128 templates/InvenTree/search.html:196
@@ -2453,15 +2452,15 @@ msgid "Orders"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:22
-#: part/templates/part/supplier.html:22
+#: part/templates/part/supplier.html:23
 msgid "Delete supplier parts"
 msgstr "Tedarikçi parçalarını sil"
 
 #: company/templates/company/manufacturer_part_suppliers.html:22
 #: company/templates/company/manufacturer_part_suppliers.html:48
 #: company/templates/company/manufacturer_part_suppliers.html:142
-#: part/templates/part/manufacturer.html:24 part/templates/part/related.html:44
-#: part/templates/part/supplier.html:22 stock/views.py:844
+#: part/templates/part/related.html:44 part/templates/part/supplier.html:23
+#: part/templates/part/supplier.html:52 stock/views.py:844
 #: templates/js/company.js:203 users/models.py:193
 msgid "Delete"
 msgstr ""
@@ -2469,12 +2468,11 @@ msgstr ""
 #: company/templates/company/manufacturer_part_suppliers.html:37
 #: part/templates/part/category_navbar.html:46
 #: part/templates/part/category_navbar.html:49
-#: part/templates/part/navbar.html:25
 msgid "Parameters"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:43
-#: part/templates/part/params.html:18
+#: part/templates/part/detail.html:254
 #: templates/InvenTree/settings/category.html:29
 #: templates/InvenTree/settings/part.html:65
 msgid "New Parameter"
@@ -2485,12 +2483,12 @@ msgid "Delete parameters"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:80
-#: part/templates/part/params.html:57
+#: part/templates/part/detail.html:316
 msgid "Add Parameter"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:97
-#: part/templates/part/supplier.html:51
+#: part/templates/part/supplier.html:81
 msgid "Create new supplier"
 msgstr ""
 
@@ -2512,7 +2510,7 @@ msgstr ""
 msgid "Supplied Parts"
 msgstr ""
 
-#: company/templates/company/navbar.html:38 part/templates/part/navbar.html:36
+#: company/templates/company/navbar.html:38 part/templates/part/navbar.html:30
 #: stock/templates/stock/location.html:107
 #: stock/templates/stock/location.html:122
 #: stock/templates/stock/location.html:136
@@ -2529,7 +2527,7 @@ msgstr "Stok Kalemleri"
 #: company/templates/company/sales_orders.html:11
 #: order/templates/order/sales_orders.html:8
 #: order/templates/order/sales_orders.html:13
-#: part/templates/part/navbar.html:101 part/templates/part/navbar.html:104
+#: part/templates/part/navbar.html:89 part/templates/part/navbar.html:92
 #: part/templates/part/sales_orders.html:10 templates/InvenTree/index.html:236
 #: templates/InvenTree/search.html:345
 #: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:46
@@ -2541,7 +2539,7 @@ msgstr "Satış Emirleri"
 #: company/templates/company/purchase_orders.html:10
 #: order/templates/order/purchase_orders.html:8
 #: order/templates/order/purchase_orders.html:13
-#: part/templates/part/navbar.html:93 part/templates/part/navbar.html:96
+#: part/templates/part/navbar.html:81 part/templates/part/navbar.html:84
 #: part/templates/part/orders.html:10 templates/InvenTree/index.html:213
 #: templates/InvenTree/search.html:325
 #: templates/InvenTree/settings/tabs.html:37 templates/navbar.html:37
@@ -2621,7 +2619,7 @@ msgid "Order Part"
 msgstr ""
 
 #: company/templates/company/supplier_part_pricing.html:11
-#: part/templates/part/navbar.html:74
+#: part/templates/part/navbar.html:68
 msgid "Pricing Information"
 msgstr ""
 
@@ -2651,8 +2649,7 @@ msgstr ""
 msgid "Delete price break"
 msgstr ""
 
-#: company/views.py:65 part/templates/part/navbar.html:81
-#: part/templates/part/navbar.html:84 part/templates/part/prices.html:157
+#: company/views.py:65 part/templates/part/prices.html:157
 #: templates/InvenTree/search.html:306 templates/navbar.html:36
 msgid "Manufacturers"
 msgstr ""
@@ -4201,8 +4198,8 @@ msgstr ""
 msgid "Part Attachments"
 msgstr ""
 
-#: part/templates/part/bom.html:10 part/templates/part/navbar.html:51
-#: part/templates/part/navbar.html:54
+#: part/templates/part/bom.html:10 part/templates/part/navbar.html:45
+#: part/templates/part/navbar.html:48
 msgid "Bill of Materials"
 msgstr ""
 
@@ -4477,7 +4474,7 @@ msgid "Import Parts"
 msgstr ""
 
 #: part/templates/part/category_parametric.html:10
-#: part/templates/part/navbar.html:22 part/templates/part/params.html:10
+#: part/templates/part/detail.html:246
 msgid "Part Parameters"
 msgstr ""
 
@@ -4585,6 +4582,10 @@ msgstr ""
 msgid "Part is not active"
 msgstr ""
 
+#: part/templates/part/detail.html:253
+msgid "Add new parameter"
+msgstr ""
+
 #: part/templates/part/import_wizard/ajax_part_upload.html:29
 #: part/templates/part/import_wizard/part_upload.html:51
 msgid "Unsuffitient privileges."
@@ -4594,64 +4595,49 @@ msgstr ""
 msgid "Import Parts from File"
 msgstr ""
 
-#: part/templates/part/manufacturer.html:11
-msgid "Part Manufacturers"
-msgstr ""
-
-#: part/templates/part/manufacturer.html:24
-msgid "Delete manufacturer parts"
-msgstr ""
-
-#: part/templates/part/manufacturer.html:53
-#: part/templates/part/supplier.html:56
-msgid "Create new manufacturer"
-msgstr ""
-
-#: part/templates/part/navbar.html:29 part/templates/part/variants.html:11
+#: part/templates/part/navbar.html:23 part/templates/part/variants.html:11
 msgid "Part Variants"
 msgstr "Parça Çeşitleri"
 
-#: part/templates/part/navbar.html:32
+#: part/templates/part/navbar.html:26
 msgid "Variants"
 msgstr "Çeşitler"
 
-#: part/templates/part/navbar.html:43
+#: part/templates/part/navbar.html:37
 msgid "Allocated Stock"
 msgstr ""
 
-#: part/templates/part/navbar.html:46
+#: part/templates/part/navbar.html:40
 msgid "Allocations"
 msgstr "Tahsisler"
 
-#: part/templates/part/navbar.html:67 part/templates/part/navbar.html:70
+#: part/templates/part/navbar.html:61 part/templates/part/navbar.html:64
 msgid "Used In"
 msgstr ""
 
-#: part/templates/part/navbar.html:77
+#: part/templates/part/navbar.html:71
 msgid "Prices"
 msgstr ""
 
-#: part/templates/part/navbar.html:109 part/templates/part/part_tests.html:10
+#: part/templates/part/navbar.html:97 part/templates/part/part_tests.html:10
 msgid "Part Test Templates"
 msgstr "Parça Test Şablonları"
 
-#: part/templates/part/navbar.html:112 stock/templates/stock/item_base.html:426
-msgid "Tests"
-msgstr ""
+#: part/templates/part/navbar.html:100
+#, fuzzy
+#| msgid "Part Test Templates"
+msgid "Test Templates"
+msgstr "Parça Test Şablonları"
 
-#: part/templates/part/navbar.html:117 part/templates/part/navbar.html:120
+#: part/templates/part/navbar.html:105 part/templates/part/navbar.html:108
 #: part/templates/part/related.html:10
 msgid "Related Parts"
 msgstr ""
 
-#: part/templates/part/navbar.html:130 part/templates/part/notes.html:12
+#: part/templates/part/navbar.html:118 part/templates/part/notes.html:12
 msgid "Part Notes"
 msgstr ""
 
-#: part/templates/part/params.html:17
-msgid "Add new parameter"
-msgstr ""
-
 #: part/templates/part/part_app_base.html:12
 msgid "Part List"
 msgstr ""
@@ -4979,10 +4965,22 @@ msgstr "Stok Yok"
 msgid "Low Stock"
 msgstr "Düşük Stok"
 
-#: part/templates/part/supplier.html:10
+#: part/templates/part/supplier.html:11
 msgid "Part Suppliers"
 msgstr "Parça Tedarikçileri"
 
+#: part/templates/part/supplier.html:39
+msgid "Part Manufacturers"
+msgstr ""
+
+#: part/templates/part/supplier.html:52
+msgid "Delete manufacturer parts"
+msgstr ""
+
+#: part/templates/part/supplier.html:86 part/templates/part/supplier.html:162
+msgid "Create new manufacturer"
+msgstr ""
+
 #: part/templates/part/track.html:10
 msgid "Part Tracking"
 msgstr ""
@@ -5787,6 +5785,10 @@ msgstr ""
 msgid "No stocktake performed"
 msgstr ""
 
+#: stock/templates/stock/item_base.html:426
+msgid "Tests"
+msgstr ""
+
 #: stock/templates/stock/item_base.html:511
 msgid "Edit Stock Status"
 msgstr ""
@@ -6265,7 +6267,8 @@ msgstr ""
 
 #: templates/InvenTree/settings/appearance.html:29
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
 "        Please select another color theme :)\n"
 "    "
@@ -7913,4 +7916,3 @@ msgstr ""
 #: users/models.py:193
 msgid "Permission to delete items"
 msgstr ""
-
diff --git a/InvenTree/locale/zh/LC_MESSAGES/django.po b/InvenTree/locale/zh/LC_MESSAGES/django.po
index 104bb1680b..d48786df3e 100644
--- a/InvenTree/locale/zh/LC_MESSAGES/django.po
+++ b/InvenTree/locale/zh/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-09 05:10+0000\n"
+"POT-Creation-Date: 2021-07-09 06:58+0000\n"
 "PO-Revision-Date: 2021-07-09 05:51\n"
 "Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
@@ -603,8 +603,8 @@ msgstr ""
 #: build/models.py:110 build/templates/build/index.html:8
 #: build/templates/build/index.html:15 order/templates/order/so_builds.html:12
 #: order/templates/order/so_navbar.html:19
-#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:58
-#: part/templates/part/navbar.html:61 templates/InvenTree/index.html:191
+#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:52
+#: part/templates/part/navbar.html:55 templates/InvenTree/index.html:191
 #: templates/InvenTree/search.html:185
 #: templates/InvenTree/settings/tabs.html:34 users/models.py:44
 msgid "Build Orders"
@@ -783,7 +783,7 @@ msgstr ""
 #: order/templates/order/sales_order_detail.html:319
 #: order/templates/order/so_navbar.html:33
 #: order/templates/order/so_navbar.html:36 part/models.py:864
-#: part/templates/part/navbar.html:133
+#: part/templates/part/navbar.html:121
 #: report/templates/report/inventree_build_order_base.html:173
 #: stock/forms.py:140 stock/forms.py:284 stock/forms.py:316 stock/forms.py:344
 #: stock/models.py:536 stock/models.py:1678 stock/models.py:1784
@@ -935,8 +935,8 @@ msgstr ""
 #: build/templates/build/attachments.html:12
 #: build/templates/build/navbar.html:43 build/templates/build/navbar.html:46
 #: order/templates/order/po_navbar.html:35
-#: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:124
-#: part/templates/part/navbar.html:127 stock/templates/stock/navbar.html:47
+#: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:112
+#: part/templates/part/navbar.html:115 stock/templates/stock/navbar.html:47
 #: stock/templates/stock/navbar.html:50
 msgid "Attachments"
 msgstr ""
@@ -2286,7 +2286,7 @@ msgid "Create new manufacturer part"
 msgstr ""
 
 #: company/templates/company/detail_manufacturer_part.html:23
-#: part/templates/part/manufacturer.html:19
+#: part/templates/part/supplier.html:47
 msgid "New Manufacturer Part"
 msgstr ""
 
@@ -2294,9 +2294,8 @@ msgstr ""
 #: company/templates/company/detail_supplier_part.html:27
 #: company/templates/company/manufacturer_part_suppliers.html:20
 #: company/templates/company/manufacturer_part_suppliers.html:46
-#: part/templates/part/category.html:131
-#: part/templates/part/manufacturer.html:22
-#: part/templates/part/supplier.html:20
+#: part/templates/part/category.html:131 part/templates/part/supplier.html:21
+#: part/templates/part/supplier.html:50
 msgid "Options"
 msgstr ""
 
@@ -2329,8 +2328,8 @@ msgid "Create new Part"
 msgstr ""
 
 #: company/templates/company/detail_manufacturer_part.html:74
-#: company/views.py:66 part/templates/part/manufacturer.html:52
-#: part/templates/part/supplier.html:55
+#: company/views.py:66 part/templates/part/supplier.html:85
+#: part/templates/part/supplier.html:161
 msgid "New Manufacturer"
 msgstr ""
 
@@ -2363,14 +2362,14 @@ msgstr ""
 
 #: company/templates/company/detail_supplier_part.html:22
 #: company/templates/company/manufacturer_part_suppliers.html:17
-#: part/templates/part/part_base.html:432 part/templates/part/supplier.html:17
+#: part/templates/part/part_base.html:432 part/templates/part/supplier.html:18
 #: templates/js/stock.js:1341
 msgid "New Supplier Part"
 msgstr ""
 
 #: company/templates/company/detail_supplier_part.html:72
 #: company/templates/company/manufacturer_part_suppliers.html:96
-#: company/views.py:60 part/templates/part/supplier.html:50
+#: company/views.py:60 part/templates/part/supplier.html:80
 msgid "New Supplier"
 msgstr ""
 
@@ -2419,8 +2418,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part_navbar.html:14
 #: company/templates/company/manufacturer_part_suppliers.html:10
-#: company/views.py:59 part/templates/part/navbar.html:87
-#: part/templates/part/navbar.html:90 part/templates/part/prices.html:153
+#: company/views.py:59 part/templates/part/navbar.html:75
+#: part/templates/part/navbar.html:78 part/templates/part/prices.html:153
 #: templates/InvenTree/search.html:316 templates/navbar.html:35
 msgid "Suppliers"
 msgstr ""
@@ -2432,7 +2431,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part_navbar.html:22
 #: company/templates/company/navbar.html:41
 #: company/templates/company/supplier_part_navbar.html:15
-#: part/templates/part/navbar.html:39 stock/api.py:53
+#: part/templates/part/navbar.html:33 stock/api.py:53
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:128 templates/InvenTree/search.html:196
@@ -2453,15 +2452,15 @@ msgid "Orders"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:22
-#: part/templates/part/supplier.html:22
+#: part/templates/part/supplier.html:23
 msgid "Delete supplier parts"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:22
 #: company/templates/company/manufacturer_part_suppliers.html:48
 #: company/templates/company/manufacturer_part_suppliers.html:142
-#: part/templates/part/manufacturer.html:24 part/templates/part/related.html:44
-#: part/templates/part/supplier.html:22 stock/views.py:844
+#: part/templates/part/related.html:44 part/templates/part/supplier.html:23
+#: part/templates/part/supplier.html:52 stock/views.py:844
 #: templates/js/company.js:203 users/models.py:193
 msgid "Delete"
 msgstr ""
@@ -2469,12 +2468,11 @@ msgstr ""
 #: company/templates/company/manufacturer_part_suppliers.html:37
 #: part/templates/part/category_navbar.html:46
 #: part/templates/part/category_navbar.html:49
-#: part/templates/part/navbar.html:25
 msgid "Parameters"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:43
-#: part/templates/part/params.html:18
+#: part/templates/part/detail.html:254
 #: templates/InvenTree/settings/category.html:29
 #: templates/InvenTree/settings/part.html:65
 msgid "New Parameter"
@@ -2485,12 +2483,12 @@ msgid "Delete parameters"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:80
-#: part/templates/part/params.html:57
+#: part/templates/part/detail.html:316
 msgid "Add Parameter"
 msgstr ""
 
 #: company/templates/company/manufacturer_part_suppliers.html:97
-#: part/templates/part/supplier.html:51
+#: part/templates/part/supplier.html:81
 msgid "Create new supplier"
 msgstr ""
 
@@ -2512,7 +2510,7 @@ msgstr ""
 msgid "Supplied Parts"
 msgstr ""
 
-#: company/templates/company/navbar.html:38 part/templates/part/navbar.html:36
+#: company/templates/company/navbar.html:38 part/templates/part/navbar.html:30
 #: stock/templates/stock/location.html:107
 #: stock/templates/stock/location.html:122
 #: stock/templates/stock/location.html:136
@@ -2529,7 +2527,7 @@ msgstr ""
 #: company/templates/company/sales_orders.html:11
 #: order/templates/order/sales_orders.html:8
 #: order/templates/order/sales_orders.html:13
-#: part/templates/part/navbar.html:101 part/templates/part/navbar.html:104
+#: part/templates/part/navbar.html:89 part/templates/part/navbar.html:92
 #: part/templates/part/sales_orders.html:10 templates/InvenTree/index.html:236
 #: templates/InvenTree/search.html:345
 #: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:46
@@ -2541,7 +2539,7 @@ msgstr ""
 #: company/templates/company/purchase_orders.html:10
 #: order/templates/order/purchase_orders.html:8
 #: order/templates/order/purchase_orders.html:13
-#: part/templates/part/navbar.html:93 part/templates/part/navbar.html:96
+#: part/templates/part/navbar.html:81 part/templates/part/navbar.html:84
 #: part/templates/part/orders.html:10 templates/InvenTree/index.html:213
 #: templates/InvenTree/search.html:325
 #: templates/InvenTree/settings/tabs.html:37 templates/navbar.html:37
@@ -2621,7 +2619,7 @@ msgid "Order Part"
 msgstr ""
 
 #: company/templates/company/supplier_part_pricing.html:11
-#: part/templates/part/navbar.html:74
+#: part/templates/part/navbar.html:68
 msgid "Pricing Information"
 msgstr ""
 
@@ -2651,8 +2649,7 @@ msgstr ""
 msgid "Delete price break"
 msgstr ""
 
-#: company/views.py:65 part/templates/part/navbar.html:81
-#: part/templates/part/navbar.html:84 part/templates/part/prices.html:157
+#: company/views.py:65 part/templates/part/prices.html:157
 #: templates/InvenTree/search.html:306 templates/navbar.html:36
 msgid "Manufacturers"
 msgstr ""
@@ -4201,8 +4198,8 @@ msgstr ""
 msgid "Part Attachments"
 msgstr ""
 
-#: part/templates/part/bom.html:10 part/templates/part/navbar.html:51
-#: part/templates/part/navbar.html:54
+#: part/templates/part/bom.html:10 part/templates/part/navbar.html:45
+#: part/templates/part/navbar.html:48
 msgid "Bill of Materials"
 msgstr ""
 
@@ -4477,7 +4474,7 @@ msgid "Import Parts"
 msgstr ""
 
 #: part/templates/part/category_parametric.html:10
-#: part/templates/part/navbar.html:22 part/templates/part/params.html:10
+#: part/templates/part/detail.html:246
 msgid "Part Parameters"
 msgstr ""
 
@@ -4585,6 +4582,10 @@ msgstr ""
 msgid "Part is not active"
 msgstr ""
 
+#: part/templates/part/detail.html:253
+msgid "Add new parameter"
+msgstr ""
+
 #: part/templates/part/import_wizard/ajax_part_upload.html:29
 #: part/templates/part/import_wizard/part_upload.html:51
 msgid "Unsuffitient privileges."
@@ -4594,64 +4595,47 @@ msgstr ""
 msgid "Import Parts from File"
 msgstr ""
 
-#: part/templates/part/manufacturer.html:11
-msgid "Part Manufacturers"
-msgstr ""
-
-#: part/templates/part/manufacturer.html:24
-msgid "Delete manufacturer parts"
-msgstr ""
-
-#: part/templates/part/manufacturer.html:53
-#: part/templates/part/supplier.html:56
-msgid "Create new manufacturer"
-msgstr ""
-
-#: part/templates/part/navbar.html:29 part/templates/part/variants.html:11
+#: part/templates/part/navbar.html:23 part/templates/part/variants.html:11
 msgid "Part Variants"
 msgstr ""
 
-#: part/templates/part/navbar.html:32
+#: part/templates/part/navbar.html:26
 msgid "Variants"
 msgstr ""
 
-#: part/templates/part/navbar.html:43
+#: part/templates/part/navbar.html:37
 msgid "Allocated Stock"
 msgstr ""
 
-#: part/templates/part/navbar.html:46
+#: part/templates/part/navbar.html:40
 msgid "Allocations"
 msgstr ""
 
-#: part/templates/part/navbar.html:67 part/templates/part/navbar.html:70
+#: part/templates/part/navbar.html:61 part/templates/part/navbar.html:64
 msgid "Used In"
 msgstr ""
 
-#: part/templates/part/navbar.html:77
+#: part/templates/part/navbar.html:71
 msgid "Prices"
 msgstr ""
 
-#: part/templates/part/navbar.html:109 part/templates/part/part_tests.html:10
+#: part/templates/part/navbar.html:97 part/templates/part/part_tests.html:10
 msgid "Part Test Templates"
 msgstr ""
 
-#: part/templates/part/navbar.html:112 stock/templates/stock/item_base.html:426
-msgid "Tests"
+#: part/templates/part/navbar.html:100
+msgid "Test Templates"
 msgstr ""
 
-#: part/templates/part/navbar.html:117 part/templates/part/navbar.html:120
+#: part/templates/part/navbar.html:105 part/templates/part/navbar.html:108
 #: part/templates/part/related.html:10
 msgid "Related Parts"
 msgstr ""
 
-#: part/templates/part/navbar.html:130 part/templates/part/notes.html:12
+#: part/templates/part/navbar.html:118 part/templates/part/notes.html:12
 msgid "Part Notes"
 msgstr ""
 
-#: part/templates/part/params.html:17
-msgid "Add new parameter"
-msgstr ""
-
 #: part/templates/part/part_app_base.html:12
 msgid "Part List"
 msgstr ""
@@ -4979,10 +4963,22 @@ msgstr ""
 msgid "Low Stock"
 msgstr ""
 
-#: part/templates/part/supplier.html:10
+#: part/templates/part/supplier.html:11
 msgid "Part Suppliers"
 msgstr ""
 
+#: part/templates/part/supplier.html:39
+msgid "Part Manufacturers"
+msgstr ""
+
+#: part/templates/part/supplier.html:52
+msgid "Delete manufacturer parts"
+msgstr ""
+
+#: part/templates/part/supplier.html:86 part/templates/part/supplier.html:162
+msgid "Create new manufacturer"
+msgstr ""
+
 #: part/templates/part/track.html:10
 msgid "Part Tracking"
 msgstr ""
@@ -5787,6 +5783,10 @@ msgstr ""
 msgid "No stocktake performed"
 msgstr ""
 
+#: stock/templates/stock/item_base.html:426
+msgid "Tests"
+msgstr ""
+
 #: stock/templates/stock/item_base.html:511
 msgid "Edit Stock Status"
 msgstr ""
@@ -6265,7 +6265,8 @@ msgstr ""
 
 #: templates/InvenTree/settings/appearance.html:29
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
 "        Please select another color theme :)\n"
 "    "
@@ -7913,4 +7914,3 @@ msgstr ""
 #: users/models.py:193
 msgid "Permission to delete items"
 msgstr ""
-