diff --git a/src/translations/de.ts b/src/translations/de.ts
index 3d4a5c596b..6de352ea8e 100644
--- a/src/translations/de.ts
+++ b/src/translations/de.ts
@@ -34,6 +34,8 @@ export const de: Translations = {
     securityEnabled: 'Aktive Sicherungsmaßnahmen',
     DataSet: 'Datensetz',
     Communication: 'Kommunikation',
+    TrgOps: 'Triggerbedingungen',
+    OptFields: 'Optionale felder',
   },
   settings: {
     title: 'Einstellungen',
diff --git a/src/translations/en.ts b/src/translations/en.ts
index 0f2698340d..03b21e020f 100644
--- a/src/translations/en.ts
+++ b/src/translations/en.ts
@@ -32,6 +32,8 @@ export const en = {
     securityEnabled: 'Security enabled',
     DataSet: 'Dataset',
     Communication: 'Communication',
+    TrgOps: 'Trigger options',
+    OptFields: 'Optional fields',
   },
   settings: {
     title: 'Settings',
diff --git a/src/wizards/dataset.ts b/src/wizards/dataset.ts
index 7bf27bc6b1..ecb24430a6 100644
--- a/src/wizards/dataset.ts
+++ b/src/wizards/dataset.ts
@@ -11,7 +11,7 @@ import {
   cloneElement,
   getValue,
   identity,
-  newWizardEvent,
+  newSubWizardEvent,
   selector,
   Update,
   Wizard,
@@ -19,7 +19,7 @@ import {
   WizardActor,
   WizardInput,
 } from '../foundation.js';
-import { wizards } from './wizard-library.js';
+import { createFCDAsWizard } from './fcda.js';
 
 function updateDataSetAction(element: Element): WizardActor {
   return (inputs: WizardInput[], wizard: Element): WizardAction[] => {
@@ -95,6 +95,7 @@ export function editDataSetWizard(element: Element): Wizard {
           .maybeValue=${name}
           helper="${translate('scl.name')}"
           required
+          disabled="true"
         >
         </wizard-textfield>`,
         html`<wizard-textfield
@@ -105,17 +106,6 @@ export function editDataSetWizard(element: Element): Wizard {
           required
         >
         </wizard-textfield>`,
-        html`<mwc-button
-          icon="add"
-          label="${translate('wizard.title.add', { tagName: 'FCDA' })}"
-          @click=${(e: Event) => {
-            const wizard = wizards['FCDA'].create(element);
-            if (wizard) {
-              e.target?.dispatchEvent(newWizardEvent(wizard));
-              e.target?.dispatchEvent(newWizardEvent());
-            }
-          }}
-        ></mwc-button>`,
         html`<filtered-list multi
           >${Array.from(element.querySelectorAll('FCDA')).map(
             fcda =>
@@ -124,6 +114,15 @@ export function editDataSetWizard(element: Element): Wizard {
               >`
           )}</filtered-list
         >`,
+        html`<mwc-button
+          icon="add"
+          label="${translate('wizard.title.add', { tagName: 'FCDA' })}"
+          @click="${(e: Event) => {
+            e.target?.dispatchEvent(
+              newSubWizardEvent(() => createFCDAsWizard(element))
+            );
+          }}"
+        ></mwc-button>`,
       ],
     },
   ];
diff --git a/src/wizards/fcda.ts b/src/wizards/fcda.ts
index c9aace2906..c71ed473f1 100644
--- a/src/wizards/fcda.ts
+++ b/src/wizards/fcda.ts
@@ -114,9 +114,8 @@ function getReader(server: Element): (path: string[]) => Promise<Directory> {
   };
 }
 
-export function createFCDAsWizard(parent: Element): Wizard | undefined {
+export function createFCDAsWizard(parent: Element): Wizard {
   const server = parent.closest('Server');
-  if (!server) return;
 
   return [
     {
@@ -127,13 +126,15 @@ export function createFCDAsWizard(parent: Element): Wizard | undefined {
         action: createFCDAsAction(parent),
       },
       content: [
-        html`<finder-list
-          multi
-          .paths=${[['Server: ' + identity(server)]]}
-          .read=${getReader(server)}
-          .getDisplayString=${getDisplayString}
-          .getTitle=${(path: string[]) => path[path.length - 1]}
-        ></finder-list>`,
+        server
+          ? html`<finder-list
+              multi
+              .paths=${[['Server: ' + identity(server)]]}
+              .read=${getReader(server)}
+              .getDisplayString=${getDisplayString}
+              .getTitle=${(path: string[]) => path[path.length - 1]}
+            ></finder-list>`
+          : html``,
       ],
     },
   ];
diff --git a/src/wizards/reportcontrol.ts b/src/wizards/reportcontrol.ts
index 289c1880b7..4a2c85f7db 100644
--- a/src/wizards/reportcontrol.ts
+++ b/src/wizards/reportcontrol.ts
@@ -29,6 +29,9 @@ import {
   Delete,
 } from '../foundation.js';
 import { maxLength, patterns } from './foundation/limits.js';
+import { editTrgOpsWizard } from './trgops.js';
+import { editOptFieldsWizard } from './optfields.js';
+import { editDataSetWizard } from './dataset.js';
 
 export function removeReportControlAction(element: Element): Delete[] {
   if (!element.parentElement) return [];
@@ -241,6 +244,12 @@ export function editReportControlWizard(element: Element): Wizard {
   const bufTime = element.getAttribute('bufTime');
   const intgPd = element.getAttribute('intgPd');
 
+  const trgOps = element.querySelector('TrgOps');
+  const optFields = element.querySelector('OptFields');
+  const dataSet = element.parentElement?.querySelector(
+    `DataSet[name="${element.getAttribute('datSet')}"]`
+  );
+
   return [
     {
       title: get('wizard.title.edit', { tagName: element.tagName }),
@@ -261,6 +270,42 @@ export function editReportControlWizard(element: Element): Wizard {
           bufTime,
           intgPd,
         }),
+        dataSet
+          ? html`<mwc-button
+              label=${translate('scl.DataSet')}
+              icon="edit"
+              id="editdataset"
+              @click=${(e: MouseEvent) => {
+                e.target?.dispatchEvent(
+                  newSubWizardEvent(() => editDataSetWizard(dataSet))
+                );
+              }}
+            ></mwc-button>`
+          : html``,
+        trgOps
+          ? html`<mwc-button
+              label=${translate('scl.TrgOps')}
+              icon="edit"
+              id="edittrgops"
+              @click=${(e: MouseEvent) => {
+                e.target?.dispatchEvent(
+                  newSubWizardEvent(() => editTrgOpsWizard(trgOps))
+                );
+              }}
+            ></mwc-button>`
+          : html``,
+        optFields
+          ? html`<mwc-button
+              label=${translate('scl.OptFields')}
+              icon="edit"
+              id="editoptfields"
+              @click=${(e: MouseEvent) => {
+                e.target?.dispatchEvent(
+                  newSubWizardEvent(() => editOptFieldsWizard(optFields))
+                );
+              }}
+            ></mwc-button>`
+          : html``,
         html`<mwc-button
           label="${translate('remove')}"
           icon="delete"
diff --git a/src/wizards/trgops.ts b/src/wizards/trgops.ts
index b763c3d117..221c6ec048 100644
--- a/src/wizards/trgops.ts
+++ b/src/wizards/trgops.ts
@@ -6,7 +6,6 @@ import '@material/mwc-list/mwc-list-item';
 import '../wizard-select.js';
 import {
   cloneElement,
-  EditorAction,
   getValue,
   Wizard,
   WizardAction,
@@ -14,22 +13,6 @@ import {
   WizardInput,
 } from '../foundation.js';
 
-function updateIntPdInParentReportAction(
-  report: Element | null,
-  isPeriodActive: boolean
-): EditorAction | undefined {
-  if (
-    !report ||
-    (isPeriodActive && report.getAttribute('intgPd')) ||
-    (!isPeriodActive && !report.getAttribute('intgPd'))
-  )
-    return;
-
-  const intgPd = isPeriodActive ? '1000' : null;
-  const newElement = cloneElement(report, { intgPd });
-  return { old: { element: report }, new: { element: newElement } };
-}
-
 function updateTrgOpsAction(element: Element): WizardActor {
   return (inputs: WizardInput[]): WizardAction[] => {
     const dchg = getValue(inputs.find(i => i.label === 'dchg')!);
@@ -56,12 +39,7 @@ function updateTrgOpsAction(element: Element): WizardActor {
     });
     const trgOptAction = { old: { element }, new: { element: newElement } };
 
-    const intPdAction = updateIntPdInParentReportAction(
-      element.parentElement,
-      period === 'true' ? true : false
-    );
-
-    return intPdAction ? [trgOptAction, intPdAction] : [trgOptAction];
+    return [trgOptAction];
   };
 }
 
diff --git a/test/integration/wizards/reportcontrol-wizarding-editing.test.ts b/test/integration/wizards/reportcontrol-wizarding-editing.test.ts
index 915adca60f..f14f713169 100644
--- a/test/integration/wizards/reportcontrol-wizarding-editing.test.ts
+++ b/test/integration/wizards/reportcontrol-wizarding-editing.test.ts
@@ -79,6 +79,7 @@ describe('Wizards for SCL element ReportControl', () => {
     let parentIED: Element;
 
     beforeEach(async () => {
+      element.workflow.length = 0; // remove all wizard from FIFO queue
       parentIED = doc.querySelector('IED')!;
       element.workflow.push(() => selectReportControlWizard(parentIED));
       await element.requestUpdate();
@@ -162,6 +163,61 @@ describe('Wizards for SCL element ReportControl', () => {
       expect(report.innerHTML).to.contain('ReportCb');
     });
 
+    it('opens edit wizard for DataSet element on edit dataset button click', async () => {
+      const editDataSetButton = <Button>(
+        element.wizardUI.dialog!.querySelector('mwc-button[id="editdataset"]')!
+      );
+
+      await editDataSetButton.updateComplete;
+      editDataSetButton.click();
+      await new Promise(resolve => setTimeout(resolve, 100)); // await animation
+
+      const nameField = <WizardTextField>(
+        element.wizardUI.dialog?.querySelector('wizard-textfield[label="name"]')
+      );
+      await nameField.updateComplete;
+
+      expect(nameField.value).to.equal(
+        doc.querySelectorAll('DataSet')[1].getAttribute('name')
+      );
+    });
+
+    it('opens edit wizard for TrgOps element on edit trigger options button click', async () => {
+      const editTrgOpsButton = <Button>(
+        element.wizardUI.dialog!.querySelector('mwc-button[id="edittrgops"]')!
+      );
+
+      await editTrgOpsButton.updateComplete;
+      editTrgOpsButton.click();
+      await new Promise(resolve => setTimeout(resolve, 100)); // await animation
+
+      const dchgSelect = <WizardTextField>(
+        element.wizardUI.dialog?.querySelector('wizard-select[label="dchg"]')
+      );
+      await dchgSelect.updateComplete;
+
+      expect(dchgSelect).to.exist;
+    });
+
+    it('opens edit wizard for OptFields element on edit optional fields button click', async () => {
+      const editOptFieldsButton = <Button>(
+        element.wizardUI.dialog!.querySelector(
+          'mwc-button[id="editoptfields"]'
+        )!
+      );
+
+      await editOptFieldsButton.updateComplete;
+      editOptFieldsButton.click();
+      await new Promise(resolve => setTimeout(resolve, 100)); // await animation
+
+      const seqNumSelect = <WizardTextField>(
+        element.wizardUI.dialog?.querySelector('wizard-select[label="seqNum"]')
+      );
+      await seqNumSelect.updateComplete;
+
+      expect(seqNumSelect).to.exist;
+    });
+
     it('removes the ReportControl element and its referenced elements on remove button click', async () => {
       expect(
         doc.querySelector(
diff --git a/test/unit/wizards/__snapshots__/dataset.test.snap.js b/test/unit/wizards/__snapshots__/dataset.test.snap.js
index 5b297d70ab..4c987b3e23 100644
--- a/test/unit/wizards/__snapshots__/dataset.test.snap.js
+++ b/test/unit/wizards/__snapshots__/dataset.test.snap.js
@@ -9,6 +9,7 @@ snapshots["dataset wizards include a dataset edit wizard looks like the latest s
 >
   <div id="wizard-content">
     <wizard-textfield
+      disabled=""
       helper="[scl.name]"
       label="name"
       required=""
@@ -22,11 +23,6 @@ snapshots["dataset wizards include a dataset edit wizard looks like the latest s
       required=""
     >
     </wizard-textfield>
-    <mwc-button
-      icon="add"
-      label="[wizard.title.add]"
-    >
-    </mwc-button>
     <filtered-list multi="">
       <mwc-check-list-item
         aria-disabled="false"
@@ -59,6 +55,11 @@ snapshots["dataset wizards include a dataset edit wizard looks like the latest s
         CBSW/ XSWI 2.OpSlc.dsd sasd.ads.asd (ST)
       </mwc-check-list-item>
     </filtered-list>
+    <mwc-button
+      icon="add"
+      label="[wizard.title.add]"
+    >
+    </mwc-button>
   </div>
   <mwc-button
     dialogaction="close"
diff --git a/test/unit/wizards/__snapshots__/reportcontrol.test.snap.js b/test/unit/wizards/__snapshots__/reportcontrol.test.snap.js
index 985caab615..2f639b338c 100644
--- a/test/unit/wizards/__snapshots__/reportcontrol.test.snap.js
+++ b/test/unit/wizards/__snapshots__/reportcontrol.test.snap.js
@@ -110,6 +110,24 @@ snapshots["Wizards for SCL ReportControl element define an edit wizard that look
       type="number"
     >
     </wizard-textfield>
+    <mwc-button
+      icon="edit"
+      id="editdataset"
+      label="[scl.DataSet]"
+    >
+    </mwc-button>
+    <mwc-button
+      icon="edit"
+      id="edittrgops"
+      label="[scl.TrgOps]"
+    >
+    </mwc-button>
+    <mwc-button
+      icon="edit"
+      id="editoptfields"
+      label="[scl.OptFields]"
+    >
+    </mwc-button>
     <mwc-button
       icon="delete"
       label="[remove]"
diff --git a/test/unit/wizards/dataset.test.ts b/test/unit/wizards/dataset.test.ts
index 232f12802a..6f6ce40e58 100644
--- a/test/unit/wizards/dataset.test.ts
+++ b/test/unit/wizards/dataset.test.ts
@@ -1,5 +1,5 @@
 import { expect, fixture, html } from '@open-wc/testing';
-import sinon, { SinonSpy } from 'sinon';
+import { SinonSpy, spy } from 'sinon';
 
 import '../../mock-wizard.js';
 import { MockWizard } from '../../mock-wizard.js';
@@ -36,9 +36,9 @@ describe('dataset wizards', () => {
       element.workflow.push(() => wizard);
       await element.requestUpdate();
 
-      wizardEvent = sinon.spy();
+      wizardEvent = spy();
       window.addEventListener('wizard', wizardEvent);
-      actionEvent = sinon.spy();
+      actionEvent = spy();
       window.addEventListener('editor-action', actionEvent);
     });
 
@@ -50,7 +50,7 @@ describe('dataset wizards', () => {
         element.wizardUI.dialog?.querySelector('mwc-button[icon="add"]')
       );
       await addButton.click();
-      expect(wizardEvent).to.be.calledTwice;
+      expect(wizardEvent).to.be.calledOnce;
     });
 
     describe('with stand alone DataSet', () => {
diff --git a/test/unit/wizards/fcda.test.ts b/test/unit/wizards/fcda.test.ts
index e78ec6db03..82995f0481 100644
--- a/test/unit/wizards/fcda.test.ts
+++ b/test/unit/wizards/fcda.test.ts
@@ -1,5 +1,5 @@
 import { expect, fixture, html } from '@open-wc/testing';
-import sinon, { SinonSpy } from 'sinon';
+import { SinonSpy, spy } from 'sinon';
 
 import '../../mock-wizard.js';
 import { MockWizard } from '../../mock-wizard.js';
@@ -21,7 +21,7 @@ describe('create wizard for FCDA element', () => {
       .then(response => response.text())
       .then(str => new DOMParser().parseFromString(str, 'application/xml'));
 
-    actionEvent = sinon.spy();
+    actionEvent = spy();
     window.addEventListener('editor-action', actionEvent);
   });
 
@@ -43,10 +43,6 @@ describe('create wizard for FCDA element', () => {
       await expect(element.wizardUI.dialog).to.equalSnapshot();
     });
 
-    it('returns undefined wizard for parents without Server', () =>
-      expect(createFCDAsWizard(doc.querySelector('AccessPoint')!)).to.be
-        .undefined);
-
     it('indicates error in case children cannot be determined', async () => {
       finder.paths = [['some wrong path']];
       await element.requestUpdate();
diff --git a/test/unit/wizards/trgops.test.ts b/test/unit/wizards/trgops.test.ts
index 5fd2a03902..b7a0eee114 100644
--- a/test/unit/wizards/trgops.test.ts
+++ b/test/unit/wizards/trgops.test.ts
@@ -143,99 +143,5 @@ describe('Wizards for SCL TrgOps element', () => {
       expect(updateAction.old.element).to.not.have.attribute('period');
       expect(updateAction.new.element).to.have.attribute('period', 'true');
     });
-
-    describe('with existing parent report control block', () => {
-      let reportControlBlock: Element;
-
-      beforeEach(async () => {
-        reportControlBlock = <Element>(
-          new DOMParser().parseFromString(
-            `<ReportControl><TrgOps gi="false"></TrgOps></ReportControl>`,
-            'application/xml'
-          ).documentElement
-        );
-        trgOps = reportControlBlock.querySelector('TrgOps')!;
-        element.workflow.length = 0;
-        const wizard = editTrgOpsWizard(trgOps);
-        element.workflow.push(() => wizard);
-        await element.requestUpdate();
-
-        inputs = Array.from(element.wizardUI.inputs);
-        await element.requestUpdate();
-
-        primaryAction = <HTMLElement>(
-          element.wizardUI.dialog?.querySelector(
-            'mwc-button[slot="primaryAction"]'
-          )
-        );
-      });
-
-      it('adds missing intgPd in parent report control block with selected period', async () => {
-        const input = <WizardSelect>inputs[3];
-        input.nullSwitch?.click();
-        input.value = 'true';
-        await input.requestUpdate();
-
-        primaryAction.click();
-        await element.requestUpdate();
-        expect(actionEvent).to.be.calledTwice;
-
-        const action1 = actionEvent.args[0][0].detail.action;
-        const action2 = actionEvent.args[1][0].detail.action;
-
-        expect(action1).to.satisfy(isUpdate);
-        expect(action2).to.satisfy(isUpdate);
-
-        const updateAction2 = <Update>action2;
-
-        expect(updateAction2.old.element).to.not.have.attribute('intgPd');
-        expect(updateAction2.new.element).to.have.attribute('intgPd', '1000');
-      });
-
-      it('removes intgPd in parent report control block with deselected period', async () => {
-        const input = <WizardSelect>inputs[3];
-        reportControlBlock.setAttribute('intgPd', '1000');
-        input.nullSwitch?.click();
-        input.value = 'false';
-        await input.requestUpdate();
-
-        primaryAction.click();
-        await element.requestUpdate();
-        expect(actionEvent).to.be.calledTwice;
-
-        const action1 = actionEvent.args[0][0].detail.action;
-        const action2 = actionEvent.args[1][0].detail.action;
-
-        expect(action1).to.satisfy(isUpdate);
-        expect(action2).to.satisfy(isUpdate);
-
-        const updateAction2 = <Update>action2;
-        expect(updateAction2.old.element).to.have.attribute('intgPd', '1000');
-        expect(updateAction2.new.element).to.not.have.attribute('intgPd');
-      });
-
-      it('does not falsely add intgPd in parent report control block', async () => {
-        const input = <WizardSelect>inputs[3];
-        reportControlBlock.setAttribute('intgPd', '1000');
-        input.nullSwitch?.click();
-        input.value = 'true';
-        await input.requestUpdate();
-
-        primaryAction.click();
-        await element.requestUpdate();
-        expect(actionEvent).to.be.calledOnce;
-      });
-
-      it('does not falsely remove intgPd in parent report control block', async () => {
-        const input = <WizardSelect>inputs[3];
-        input.nullSwitch?.click();
-        input.value = 'false';
-        await input.requestUpdate();
-
-        primaryAction.click();
-        await element.requestUpdate();
-        expect(actionEvent).to.be.calledOnce;
-      });
-    });
   });
 });