diff --git a/vscode-extension/src/Services/WebPanelCommandService.ts b/vscode-extension/src/Services/WebPanelCommandService.ts
index dde6262..83a5d26 100644
--- a/vscode-extension/src/Services/WebPanelCommandService.ts
+++ b/vscode-extension/src/Services/WebPanelCommandService.ts
@@ -184,5 +184,17 @@ export class WebPanelCommandService {
         await this.excelService.export(entries);
         WebPanel.postMessage(null);
     }
+    
+    async GetConfigurationCommand(message: IMessageBase) {
+        // TODO
+        let setting = false;        
+        WebPanel.postMessage({ Command: 'GetConfiguration', setting});
+    }
 
+    async SetConfigurationCommand(message: IMessageBase) {
+        // TODO
+        //let setting = message.Data as boolean;
+        //
+        WebPanel.postMessage({Command: 'SetConfiguration', Data: null});
+    }
 }
\ No newline at end of file
diff --git a/web-ui/src/resources/elements/toolbar.html b/web-ui/src/resources/elements/toolbar.html
index ca022e3..98ccd31 100644
--- a/web-ui/src/resources/elements/toolbar.html
+++ b/web-ui/src/resources/elements/toolbar.html
@@ -28,12 +28,22 @@
                         <i class="fas fa-minus"></i> <span class="d-none d-lg-inline">Scenario</span></button>
                 </li>
                 <li>
-                    <button class="btn btn-outline-secondary my-2 my-sm-0">
-                        <i class="fas fa-play"></i> <span class="d-none d-lg-inline" title="Run Tests">Run Tests</span></button>
+                    <button class="btn btn-outline-secondary my-2 my-sm-0" title="Run Tests">
+                        <i class="fas fa-play"></i> <span class="d-none d-lg-inline">Run Tests</span></button>
                 </li>
                 <li>
-                    <button class="btn btn-outline-secondary my-2 my-sm-0" click.delegate="sendCommand('Export')">
-                        <i class="fas fa-file-excel"></i> <span class="d-none d-lg-inline" title="Export to Excel">Export</span></button>
+                    <button class="btn btn-outline-secondary my-2 my-sm-0" click.delegate="sendCommand('Export')" title="Export to Excel">
+                        <i class="fas fa-file-excel"></i> <span class="d-none d-lg-inline">Export</span></button>
+                </li>
+                <li>
+                    <div class="btn-group-toggle my-2 my-sm-0" data-toggle="buttons" title="No Confirmation">
+                        <label class="btn ${(noConfirmations ? 'btn-outline-success' : 'btn-outline-secondary')}">
+                            <span show.bind="noConfirmations"><i class="fas fa-check-square"></i></span>
+                            <span show.bind="!noConfirmations"><i class="far fa-square"></i></span>
+                            <span class="d-none d-lg-inline">No Confirmation</span>
+                            <input type="checkbox" value.bind="noConfirmations" checked.bind="noConfirmations">
+                        </label>
+                    </div>
                 </li>
             </ul>
             <a class="navbar-brand" href="#">ATDD.TestScriptor</a>
diff --git a/web-ui/src/resources/elements/toolbar.ts b/web-ui/src/resources/elements/toolbar.ts
index ace3113..18a0173 100644
--- a/web-ui/src/resources/elements/toolbar.ts
+++ b/web-ui/src/resources/elements/toolbar.ts
@@ -1,5 +1,4 @@
-import { EventAggregator } from 'aurelia-event-aggregator';
-import { CommandHandlerService } from "backend/CommandHandlerService";
+import { BackendService } from 'services/backend-service';
 import { autoinject, bindable } from "aurelia-framework";
 
 @autoinject()
@@ -8,10 +7,34 @@ export class Toolbar {
     @bindable()
     searchValue: string;
 
-    constructor(private commandHandlerService: CommandHandlerService) {
+    @bindable()
+    noConfirmations: boolean = false;
+
+    loaded: boolean = false;
+
+    constructor(private backendService: BackendService) {
+    }
+
+    async attached() {
+        try {
+            let currentSetting = await this.sendCommand('GetConfiguration');
+            this.noConfirmations = currentSetting;
+        } catch {
+            console.log('GetConfiguration call is not yet implemented');
+        }
+
+        this.loaded = true;
     }
 
     async sendCommand(command: string, data?: any) {
-        await this.commandHandlerService.dispatch(command, data);
+        return await this.backendService.send({ Command: command, Data: data });
+    }
+
+    noConfirmationsChanged(newValue: boolean) {
+        if (this.loaded !== true) {
+            return;
+        }
+
+        this.sendCommand('SetConfiguration', newValue);
     }
 }
\ No newline at end of file