diff --git a/package-lock.json b/package-lock.json
index fa4d9bf41b4..7602310c5d9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3423,34 +3423,34 @@
       }
     },
     "@sentry/core": {
-      "version": "5.27.2",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.27.2.tgz",
-      "integrity": "sha512-FMX0Aignhi9Rk4tZkjwSXCsFFQc8FIOgUTvfIKCdayLhKxfbY0H37b0fFNzaQ9v15SFzIZJ9uzw4PTmjzEh6Uw==",
-      "requires": {
-        "@sentry/hub": "5.27.2",
-        "@sentry/minimal": "5.27.2",
-        "@sentry/types": "5.27.2",
-        "@sentry/utils": "5.27.2",
+      "version": "5.27.3",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.27.3.tgz",
+      "integrity": "sha512-yqepQO88jSt5hy0awpk61AxI4oHB09LjVbUEk4nJDg+1YXuND23cuZvH+Sp2jCZX2vrsw2tefwflToYfA8/U2w==",
+      "requires": {
+        "@sentry/hub": "5.27.3",
+        "@sentry/minimal": "5.27.3",
+        "@sentry/types": "5.27.3",
+        "@sentry/utils": "5.27.3",
         "tslib": "^1.9.3"
       }
     },
     "@sentry/hub": {
-      "version": "5.27.2",
-      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.27.2.tgz",
-      "integrity": "sha512-KCAWF5oDXd/Pjzbcmfj53F5ZzOX53Rzi23a2mWyUXMdPXoXIiMrIcdC/DqrqKV787LvOJcSFaTychJCH3t15/A==",
+      "version": "5.27.3",
+      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.27.3.tgz",
+      "integrity": "sha512-icEH3hr6NVQkpowXZcPOs9IgJZP5lMKtvud4mVioSpkd+NxtRdKrGEX4eF2TCviOJc9Md0mV4K+aL5Au7hxggQ==",
       "requires": {
-        "@sentry/types": "5.27.2",
-        "@sentry/utils": "5.27.2",
+        "@sentry/types": "5.27.3",
+        "@sentry/utils": "5.27.3",
         "tslib": "^1.9.3"
       }
     },
     "@sentry/integrations": {
-      "version": "5.27.2",
-      "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-5.27.2.tgz",
-      "integrity": "sha512-sTCZeAVL9b0PiIjj2KE8qgtS0FgXmhmeEwoQDF2iOr5nk4p/6Xav6S5UPPIY+xe5M44jGCcX5vI4jZqGczaHZg==",
+      "version": "5.27.3",
+      "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-5.27.3.tgz",
+      "integrity": "sha512-lmkYH3g1ZW9I8g3SXQNYIfNc9gaNoqJUxgTI9d0AQph+mSB8Y3lx50NYMAfK74XgiC3VJ9j8kWstdQCMbgfXpQ==",
       "requires": {
-        "@sentry/types": "5.27.2",
-        "@sentry/utils": "5.27.2",
+        "@sentry/types": "5.27.3",
+        "@sentry/utils": "5.27.3",
         "localforage": "1.8.1",
         "tslib": "^1.9.3"
       },
@@ -3466,25 +3466,25 @@
       }
     },
     "@sentry/minimal": {
-      "version": "5.27.2",
-      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.27.2.tgz",
-      "integrity": "sha512-n9SssI30rpS1tw6hH0ylxVlONdmZCqiPy60fotxUzql6mCo/nW7tcADsW15fvQlUQ160VaGf3iMj+hpHkRBerw==",
+      "version": "5.27.3",
+      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.27.3.tgz",
+      "integrity": "sha512-ng01cM0rsE1RMjqVTpPLN0ZVkTo0I675usM1krkpQe8ddW6tfQ6EJWpt02/BrpQZRQzTtfWp6/RyB1KFXg6icg==",
       "requires": {
-        "@sentry/hub": "5.27.2",
-        "@sentry/types": "5.27.2",
+        "@sentry/hub": "5.27.3",
+        "@sentry/types": "5.27.3",
         "tslib": "^1.9.3"
       }
     },
     "@sentry/node": {
-      "version": "5.27.2",
-      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-5.27.2.tgz",
-      "integrity": "sha512-JHY+EYjq3iqVnTPIow7KzKX+lIqJXZGVT0xHdPrhaVcfBtUUBYTpjO7SSCkINPt6dPKVRq0QDzIfevd5nybR7A==",
-      "requires": {
-        "@sentry/core": "5.27.2",
-        "@sentry/hub": "5.27.2",
-        "@sentry/tracing": "5.27.2",
-        "@sentry/types": "5.27.2",
-        "@sentry/utils": "5.27.2",
+      "version": "5.27.3",
+      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-5.27.3.tgz",
+      "integrity": "sha512-IZ/TkYRY+P/E5C+RF6Rcb6tpY59fyk0040Q3akzbDjb/hrw5TRKnK8fJ6/0gXCAOvlDPIlpRHFJgJ1p2QgWy+g==",
+      "requires": {
+        "@sentry/core": "5.27.3",
+        "@sentry/hub": "5.27.3",
+        "@sentry/tracing": "5.27.3",
+        "@sentry/types": "5.27.3",
+        "@sentry/utils": "5.27.3",
         "cookie": "^0.4.1",
         "https-proxy-agent": "^5.0.0",
         "lru_map": "^0.3.3",
@@ -3499,28 +3499,28 @@
       }
     },
     "@sentry/tracing": {
-      "version": "5.27.2",
-      "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-5.27.2.tgz",
-      "integrity": "sha512-5Lptd32VtKBzIzTmFqcKgcetTMRraMvjPFTX8kFVX4aGDaUGOx0cCZeAURNoHDfHfjCazYK8yV6BkJfi6YJNww==",
-      "requires": {
-        "@sentry/hub": "5.27.2",
-        "@sentry/minimal": "5.27.2",
-        "@sentry/types": "5.27.2",
-        "@sentry/utils": "5.27.2",
+      "version": "5.27.3",
+      "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-5.27.3.tgz",
+      "integrity": "sha512-UWrHMdGxPfx1u558CWm1tptc2z0BuqCHVe2+BNN7POahq5BkpbGqaotyPQTBHbfmcs6QGfsMG57ou8HQFrBxyA==",
+      "requires": {
+        "@sentry/hub": "5.27.3",
+        "@sentry/minimal": "5.27.3",
+        "@sentry/types": "5.27.3",
+        "@sentry/utils": "5.27.3",
         "tslib": "^1.9.3"
       }
     },
     "@sentry/types": {
-      "version": "5.27.2",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.27.2.tgz",
-      "integrity": "sha512-oszEOlWJuySvGc2HJ2KLTgtYwRFnHWDu8YIZ99UhmO2PcGQ5HlZJpV2oC8n3x0g1YSSlAaThjKbliJEAT7fmPg=="
+      "version": "5.27.3",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.27.3.tgz",
+      "integrity": "sha512-PkWhMArFMxBb1g3HtMEL8Ea9PYae2MU0z9CMIWiqzerFy2ZpKG98IU3pt8ic4JkmKQdwB8hDiZpRPMHhW0WYwQ=="
     },
     "@sentry/utils": {
-      "version": "5.27.2",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.27.2.tgz",
-      "integrity": "sha512-ZrdRgcFapi1NACbtvnPLOIXKjBPVTlhGzmXNCVao0uRBBRNJa5i2Mjp/U/Xy/fT0K1MGJQ+F9YZjZPnAMsDNbw==",
+      "version": "5.27.3",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.27.3.tgz",
+      "integrity": "sha512-R9WvFrRBALZvCzu/9BsuXBCfkNxz4MwdBNSXaBsJo4afQw1ljkjIc9DpHzlL9S9goIwXo81Buwmr5gGDO6aH+Q==",
       "requires": {
-        "@sentry/types": "5.27.2",
+        "@sentry/types": "5.27.3",
         "tslib": "^1.9.3"
       }
     },
@@ -4084,12 +4084,12 @@
       "dev": true
     },
     "@zwave-js/config": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/@zwave-js/config/-/config-5.3.4.tgz",
-      "integrity": "sha512-0I/6QcG0syOKqHZLRuu7pHMv8AFv3j0i/2aMUHWD22/7HfxiZ73godgKNPnOmdHLveW6XmMxRLvD5ptt7OtkCw==",
+      "version": "5.3.6",
+      "resolved": "https://registry.npmjs.org/@zwave-js/config/-/config-5.3.6.tgz",
+      "integrity": "sha512-MA7GiKmeCLbAh2akz03EnGJhv4DjBvbwQO5woGD5/lYhSdQdtbEt7D27emZZSiiMpsgPEFQjcNnGPq+ytAQZ+Q==",
       "requires": {
-        "@zwave-js/core": "^5.3.2",
-        "@zwave-js/shared": "^5.2.0",
+        "@zwave-js/core": "^5.3.6",
+        "@zwave-js/shared": "^5.3.6",
         "alcalzone-shared": "^3.0.0",
         "ansi-colors": "^4.1.1",
         "fs-extra": "^9.0.1",
@@ -4129,12 +4129,12 @@
       }
     },
     "@zwave-js/core": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/@zwave-js/core/-/core-5.3.2.tgz",
-      "integrity": "sha512-GD/3G3cW/oZuE+FfylUDoZnTS3DvaTkpU14hXYPFH7yk130m5EpCWRvjpOwhSH1zvqLlv0dem5J3sj7Nhvr6Jw==",
+      "version": "5.3.6",
+      "resolved": "https://registry.npmjs.org/@zwave-js/core/-/core-5.3.6.tgz",
+      "integrity": "sha512-4Xf4Q0/2q1O48FfAvuVoRGAAKY94aVW0mgPU+GzI/63KyOAoCXyixAyHRWEkErOMxUL3JOgjC28yCdKHfcfcPg==",
       "requires": {
         "@alcalzone/jsonl-db": "^1.2.2",
-        "@zwave-js/shared": "^5.2.0",
+        "@zwave-js/shared": "^5.3.6",
         "alcalzone-shared": "^3.0.0",
         "ansi-colors": "^4.1.1",
         "moment": "^2.29.0",
@@ -4151,20 +4151,20 @@
       }
     },
     "@zwave-js/serial": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/@zwave-js/serial/-/serial-5.3.4.tgz",
-      "integrity": "sha512-AFS91lTAupPT88BtYh6qDB9TYwsrJs8O6gRzkGgXcgxc/dyWgnf722Qngs318ZRb81ssKD6zPNFbQBZBvS4UUQ==",
+      "version": "5.3.6",
+      "resolved": "https://registry.npmjs.org/@zwave-js/serial/-/serial-5.3.6.tgz",
+      "integrity": "sha512-SA1fntHHKHzkvV87354QRg5eAujebrtrpffen8F04OcN7qEY8v7wduHSuNCJjMPZ1mx8gBuKDllSduH/idX1Mg==",
       "requires": {
-        "@zwave-js/core": "^5.3.2",
+        "@zwave-js/core": "^5.3.6",
         "alcalzone-shared": "^3.0.0",
         "serialport": "^9.0.1",
         "winston": "^3.3.3"
       }
     },
     "@zwave-js/shared": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@zwave-js/shared/-/shared-5.2.0.tgz",
-      "integrity": "sha512-tLof8Ppm2/pLbAD+ctLG0sJfKUJaih8IAJTTgcYrSweCavLfpqOZQ1FHHWTz6qSlb3pnu3b/Y8QT9yznd/C8Zg==",
+      "version": "5.3.6",
+      "resolved": "https://registry.npmjs.org/@zwave-js/shared/-/shared-5.3.6.tgz",
+      "integrity": "sha512-cnPdBZrNh73GscF9q/+KjOH3dEUSpvPXcrGtuzXYi/YBwGYu449rL2Eyif7WRn1ZNfukPJFCUPONP3auGL5bGg==",
       "requires": {
         "alcalzone-shared": "^3.0.0"
       }
@@ -22492,9 +22492,9 @@
       "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4="
     },
     "xstate": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/xstate/-/xstate-4.13.0.tgz",
-      "integrity": "sha512-UnUJJzP2KTPqnmxIoD/ymXtpy/hehZnUlO6EXqWC/72XkPb15p9Oz/X4WhS3QE+by7NP+6b5bCi/GTGFzm5D+A=="
+      "version": "4.14.0",
+      "resolved": "https://registry.npmjs.org/xstate/-/xstate-4.14.0.tgz",
+      "integrity": "sha512-nz+T5rlPl0Vu1L9NZdI7JYVq57k/pKpyLwmztqgcj/HqUVsopnMKBP6cQJCb4Op9TC8kffyJSMwHDFthuRpooQ=="
     },
     "xtend": {
       "version": "4.0.1",
@@ -22760,17 +22760,17 @@
       "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk="
     },
     "zwave-js": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/zwave-js/-/zwave-js-5.3.5.tgz",
-      "integrity": "sha512-cr+axp0zz4ROhxC0jmcH855lCGhv7ZGQ5E3E5FW29QFSlgmABRjK4tQBFdRUJfl/getcPWIhlXAgtXKpV1Jrdg==",
+      "version": "5.3.6",
+      "resolved": "https://registry.npmjs.org/zwave-js/-/zwave-js-5.3.6.tgz",
+      "integrity": "sha512-FJMZs8tVRpVW8QARsVjRYjOMDoA9Bu8rIQ3m6k5t3AFvCdBRASqERRoQ7zPnwAANzOxRUqXsF5VNRjrRWCD0vA==",
       "requires": {
         "@alcalzone/jsonl-db": "^1.2.2",
         "@sentry/integrations": "^5.24.2",
         "@sentry/node": "^5.24.2",
-        "@zwave-js/config": "^5.3.4",
-        "@zwave-js/core": "^5.3.2",
-        "@zwave-js/serial": "^5.3.4",
-        "@zwave-js/shared": "^5.2.0",
+        "@zwave-js/config": "^5.3.6",
+        "@zwave-js/core": "^5.3.6",
+        "@zwave-js/serial": "^5.3.6",
+        "@zwave-js/shared": "^5.3.6",
         "alcalzone-shared": "^3.0.0",
         "ansi-colors": "^4.1.1",
         "fs-extra": "^9.0.1",
diff --git a/package.json b/package.json
index d48e40e7308..b5009fe978d 100644
--- a/package.json
+++ b/package.json
@@ -118,7 +118,7 @@
     "vue-router": "^3.4.3",
     "vuetify": "^2.3.10",
     "vuex": "^3.5.1",
-    "zwave-js": "^5.3.5"
+    "zwave-js": "^5.3.6"
   },
   "devDependencies": {
     "@babel/core": "^7.11.5",
diff --git a/src/components/ControlPanel.vue b/src/components/ControlPanel.vue
index fea6478fc0d..94ca210f5a8 100644
--- a/src/components/ControlPanel.vue
+++ b/src/components/ControlPanel.vue
@@ -398,7 +398,7 @@
             <v-tab-item key="groups">
               <v-container grid-list-md>
                 <v-layout wrap>
-                  <v-flex xs12 sm6>
+                  <v-flex xs12 sm6 md4>
                     <v-select
                       label="Node"
                       v-model="group.node"
@@ -409,7 +409,7 @@
                     ></v-select>
                   </v-flex>
 
-                  <v-flex v-if="group.node" xs12 sm6>
+                  <v-flex v-if="group.node" xs12 sm6 md4>
                     <v-select
                       label="Group"
                       v-model="group.group"
@@ -419,7 +419,7 @@
                     ></v-select>
                   </v-flex>
 
-                  <v-flex v-if="group.group" xs12 sm6>
+                  <v-flex v-if="group.node && group.group" xs12 sm6 md4>
                     <v-list subheader>
                       <v-subheader>Associations</v-subheader>
                       <v-list-item
@@ -470,6 +470,7 @@
                     v-if="group.group && group.group.multiChannel"
                     xs12
                     sm6
+                    md4
                   >
                     <v-text-field
                       v-model.number="group.targetInstance"
@@ -479,6 +480,44 @@
                     />
                   </v-flex>
 
+                  <v-flex v-if="group.group && group.associations" xs12 sm6 md4>
+                    <v-list subheader>
+                      <v-subheader>Associations</v-subheader>
+                      <v-template
+                        v-for="(ass, index) in group.associations"
+                        :key="index"
+                      >
+                        <v-list-item dense>
+                          <v-list-item-content>
+                            <v-list-item-title
+                              >Node:
+                              <b>{{
+                                nodes[ass.nodeId]._name || ass.nodeId
+                              }}</b></v-list-item-title
+                            >
+                            <v-list-item-subtitle
+                              v-if="ass.endpoint >= 0"
+                              class="text--primary"
+                              >Endpoint:
+                              <b>{{ ass.endpoint }}</b></v-list-item-subtitle
+                            >
+                          </v-list-item-content>
+                          <v-list-item-icon>
+                            <v-icon @click="removeAssociation(ass)" color="red">
+                              delete
+                            </v-icon>
+                          </v-list-item-icon>
+                        </v-list-item>
+                        <v-divider></v-divider>
+                      </v-template>
+                      <v-list-item v-if="group.associations.length === 0">
+                        <v-list-item-content>
+                          No assocaitions
+                        </v-list-item-content>
+                      </v-list-item>
+                    </v-list>
+                  </v-flex>
+
                   <v-flex xs12>
                     <v-btn
                       v-if="group.node && group.target && group.group"