diff --git a/etc/acl.xml b/etc/acl.xml
new file mode 100644
index 0000000..db6c563
--- /dev/null
+++ b/etc/acl.xml
@@ -0,0 +1,21 @@
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
+    <acl>
+        <resources>
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Sales::sales">
+                    <resource id="DpdConnect_Shipping::dpd_menu" title="DPD" translate="title" sortOrder="10">
+                        <resource id="DpdConnect_Shipping::batch_menu" title="DPD Batches" translate="title" sortOrder="11" />
+                        <resource id="DpdConnect_Shipping::label_menu" title="DPD Labels" translate="title" sortOrder="12" />
+                    </resource>
+                </resource>
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Config::config">
+                            <resource id="DpdConnect_Shipping::configuration" title="DPD Parcelservice" translate="title" sortOrder="340" />
+                        </resource>
+                    </resource>
+                </resource>
+            </resource>
+        </resources>
+    </acl>
+</config>
diff --git a/etc/adminhtml/acl.xml b/etc/adminhtml/acl.xml
deleted file mode 100644
index b86eaf5..0000000
--- a/etc/adminhtml/acl.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
-    <acl>
-        <resources>
-            <resource id="Magento_Backend::admin">
-                <resource id="Magento_Sales::sales" title="Sales" sortOrder="30">
-                    <resource id="DpdConnect_Shipping::dpd_menu" title="DPD" sortOrder="10">
-                        <resource id="DpdConnect_Shipping::batch_menu" title="DPD Batches" sortOrder="11" />
-                        <resource id="DpdConnect_Shipping::label_menu" title="DPD Labels" sortOrder="12" />
-                    </resource>
-                </resource>
-            </resource>
-        </resources>
-    </acl>
-</config>
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 69f7a2e..a62fce1 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -23,7 +23,7 @@
         <section id="dpdshipping" translate="label" type="text" sortOrder="340" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>DPD Parcelservice</label>
             <tab>sales</tab>
-            <resource>Sales_DPDShipping::configuration</resource>
+            <resource>DpdConnect_Shipping::configuration</resource>
             <class>dpd-shipping</class>
 
             <group id="header" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/dpd/advanced.xml b/etc/adminhtml/system/dpd/advanced.xml
index 64f8f24..787226f 100644
--- a/etc/adminhtml/system/dpd/advanced.xml
+++ b/etc/adminhtml/system/dpd/advanced.xml
@@ -58,7 +58,7 @@
             <label>Save labels as file</label>
             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
         </field>
-        <field id="label_path" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1"
+        <field id="label_path" translate="label comment" type="text" sortOrder="60" showInDefault="1" showInWebsite="1"
                showInStore="0">
             <label>Store labels in</label>
             <depends>
diff --git a/etc/adminhtml/system/dpd/api.xml b/etc/adminhtml/system/dpd/api.xml
index 6da3c03..d6e6209 100644
--- a/etc/adminhtml/system/dpd/api.xml
+++ b/etc/adminhtml/system/dpd/api.xml
@@ -28,7 +28,7 @@
             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
         </field>
 
-        <field id="async_threshold" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
+        <field id="async_threshold" translate="label comment" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Async threshold</label>
             <comment>Mass generation of labels above this number will be done Async</comment>
             <depends>
@@ -36,7 +36,7 @@
             </depends>
         </field>
 
-        <field id="endpoint" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
+        <field id="endpoint" translate="label comment" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Endpoint (ONLY use this if instructed, otherwise leave empty)</label>
             <comment>The DPD Connect endpoint to use (useful for development)</comment>
         </field>
diff --git a/etc/adminhtml/system/dpd/product_attribute.xml b/etc/adminhtml/system/dpd/product_attribute.xml
index 140d8af..85d5319 100644
--- a/etc/adminhtml/system/dpd/product_attribute.xml
+++ b/etc/adminhtml/system/dpd/product_attribute.xml
@@ -22,31 +22,31 @@
     <group id="product_attribute" translate="label" sortOrder="50" showInDefault="1" showInWebsite="1"
            showInStore="0">
         <label>Product attributes</label>
-        <field id="hs_code" translate="label" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+        <field id="hs_code" translate="label comment" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
             <label>Harmonized System code</label>
             <source_model>DpdConnect\Shipping\Config\Source\Settings\ProductAttribute</source_model>
             <comment>The product Harmonized System code</comment>
         </field>
 
-        <field id="dimension_length" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+        <field id="dimension_length" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
             <label>Product Length</label>
             <source_model>DpdConnect\Shipping\Config\Source\Settings\ProductAttribute</source_model>
             <comment>The product length attribute</comment>
         </field>
 
-        <field id="dimension_width" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+        <field id="dimension_width" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
             <label>Product Width</label>
             <source_model>DpdConnect\Shipping\Config\Source\Settings\ProductAttribute</source_model>
             <comment>The product width attribute</comment>
         </field>
 
-        <field id="dimension_height" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+        <field id="dimension_height" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
             <label>Product Height</label>
             <source_model>DpdConnect\Shipping\Config\Source\Settings\ProductAttribute</source_model>
             <comment>The product height attribute</comment>
         </field>
 
-        <field id="dimension_depth" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+        <field id="dimension_depth" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
             <label>Product Depth</label>
             <source_model>DpdConnect\Shipping\Config\Source\Settings\ProductAttribute</source_model>
             <comment>The product depth attribute</comment>
diff --git a/etc/adminhtml/system/dpd/shipping_origin.xml b/etc/adminhtml/system/dpd/shipping_origin.xml
index c8b4328..2580924 100644
--- a/etc/adminhtml/system/dpd/shipping_origin.xml
+++ b/etc/adminhtml/system/dpd/shipping_origin.xml
@@ -19,7 +19,7 @@
 -->
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="shipping_origin" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1"
+    <group id="shipping_origin" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1"
            showInStore="1">
         <label>Shipping Origin</label>
         <comment>These settings are used as Sender on shipping labels</comment>
diff --git a/etc/adminhtml/system/dpd/store_information.xml b/etc/adminhtml/system/dpd/store_information.xml
index 74d7ace..676a863 100644
--- a/etc/adminhtml/system/dpd/store_information.xml
+++ b/etc/adminhtml/system/dpd/store_information.xml
@@ -19,7 +19,7 @@
 -->
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="store_information" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+    <group id="store_information" translate="label" type="text comment" sortOrder="30" showInDefault="1" showInWebsite="1"
            showInStore="1">
         <comment>The store address is used in shipping lists</comment>
 
@@ -77,7 +77,7 @@
                showInStore="1">
             <label>Eori number</label>
         </field>
-        <field id="sprn" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+        <field id="sprn" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
                showInStore="1">
             <label>HMRC number</label>
             <comment>Mandatory if the value of the parcel is ≤ £ 135.</comment>