diff --git a/force-app/main/default/lwc/configurationManager/configurationManager.html b/force-app/main/default/lwc/configurationManager/configurationManager.html
index b967c25..36231d2 100644
--- a/force-app/main/default/lwc/configurationManager/configurationManager.html
+++ b/force-app/main/default/lwc/configurationManager/configurationManager.html
@@ -45,6 +45,7 @@
                 <c-key
                         bundle={bundle}
                         is-setup="true"
+                        oneditbundle={handleEditBundle}
                         oneditindicator={handleEditIndicator}>
                 </c-key>
             </lightning-layout-item>
diff --git a/force-app/main/default/lwc/configurationManager/configurationManager.js b/force-app/main/default/lwc/configurationManager/configurationManager.js
index a287091..8f223b2 100644
--- a/force-app/main/default/lwc/configurationManager/configurationManager.js
+++ b/force-app/main/default/lwc/configurationManager/configurationManager.js
@@ -131,4 +131,10 @@ export default class ConfigurationManager extends LightningElement {
         this.openModal(event.detail);
     }
 
+    handleEditBundle(event) {
+        editIndicatorBundleModal.open().then((result) => {
+                    console.log(result);
+                });
+    }
+
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/key/key.html b/force-app/main/default/lwc/key/key.html
index ee1ae93..97586e9 100644
--- a/force-app/main/default/lwc/key/key.html
+++ b/force-app/main/default/lwc/key/key.html
@@ -70,6 +70,7 @@ <h2>Bundle is not active.</h2>
                     <template lwc:if={isBundle}>
                         <lightning-button 
                             name={bundleDetails.BundleId} 
+                            data-event-type="editbundle"
                             onclick={handleClick} 
                             label="Edit Bundle" 
                             title="Edit Bundle" 
@@ -132,7 +133,7 @@ <h2>Item is not active.  No indicators will be shown, even if they are active.</
                                 </lightning-layout-item>
                                 <lightning-layout-item padding="horizontal-small" size="2" class="slds-text-align_right">
                                     <template lwc:if={isManageEnabled}>
-                                        <lightning-button name={indicatorItem.IndicatorId} onclick={handleClick} label="Edit Indicator" title="Edit Indicator" icon-name="utility:setup"></lightning-button>
+                                        <lightning-button name={indicatorItem.IndicatorId} onclick={handleClick} data-event-type="editindicator" label="Edit Indicator" title="Edit Indicator" icon-name="utility:setup"></lightning-button>
                                     </template>
                                 </lightning-layout-item>
                             </lightning-layout>
diff --git a/force-app/main/default/lwc/key/key.js b/force-app/main/default/lwc/key/key.js
index b4bc9a3..96b50dc 100644
--- a/force-app/main/default/lwc/key/key.js
+++ b/force-app/main/default/lwc/key/key.js
@@ -278,11 +278,9 @@ export default class Key extends LightningElement {
     }
 
     handleClick(event){
-        console.log(event.target.name);
-        const editindicatorEvent = new CustomEvent('editindicator', {
+        this.dispatchEvent(new CustomEvent(event.target.dataset.eventType, {
             detail: event.target.name
-        });
-        this.dispatchEvent(editindicatorEvent);
+        }));
         //window.open('/lightning/setup/CustomMetadata/page?address=%2F' + event.target.name,'_blank');
     }