diff --git a/src/packages/discovery/component/setting/probe-selector/probe-selector.component.html b/src/packages/discovery/component/setting/probe-selector/probe-selector.component.html
index 52e223b..edb7d39 100644
--- a/src/packages/discovery/component/setting/probe-selector/probe-selector.component.html
+++ b/src/packages/discovery/component/setting/probe-selector/probe-selector.component.html
@@ -1,4 +1,4 @@
 <div *ngIf="!preProbe">
   <p-dropdown [options]="probes" optionLabel="displayName" placeholder="Select a Probe" (onChange)="onProbeSelect($event)"
     [style]="{'width':'300px'}"></p-dropdown>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/packages/discovery/component/setting/result/result.component.html b/src/packages/discovery/component/setting/result/result.component.html
index e1e913f..30e94dd 100644
--- a/src/packages/discovery/component/setting/result/result.component.html
+++ b/src/packages/discovery/component/setting/result/result.component.html
@@ -2,12 +2,17 @@
   <div *ngIf="inProgress">
     <p-progressBar mode="indeterminate" [style]="{'height': '16px'}"></p-progressBar>
   </div>
-  <p-tree [value]="treeNodes" selectionMode="checkbox" [(selection)]="selectedNodes"></p-tree>
+
+  <p-blockUI [target]="result" [blocked]="inProgress"></p-blockUI>
+  <p-panel #result [showHeader]="false">
+    <p-tree [value]="treeNodes" selectionMode="checkbox" [(selection)]="selectedNodes"></p-tree>
+  </p-panel>
+
 </div>
 
 <div>
   <div dir="rtl">
-    <button pButton type="button" label="Cancel" icon="fa-close" class="ui-button-secondary ui-button-width-fit" (click)="onCancel()"></button>
     <button pButton type="button" label="Save" icon="fa-check" class="ui-button-width-fit" (click)="discoveryResultSave()"></button>
+    <button pButton type="button" label="Cancel" icon="fa-close" class="ui-button-secondary ui-button-width-fit" (click)="onCancel()"></button>
   </div>
 </div>
\ No newline at end of file
diff --git a/src/packages/discovery/component/setting/result/result.component.ts b/src/packages/discovery/component/setting/result/result.component.ts
index 34b3d2f..e22c53b 100644
--- a/src/packages/discovery/component/setting/result/result.component.ts
+++ b/src/packages/discovery/component/setting/result/result.component.ts
@@ -36,6 +36,7 @@ export class ResultComponent implements OnInit, AfterContentInit, OnDestroy {
 
   inProgress = false;
 
+
   selectedDiscoveryResult: TreeNode[];
 
   constructor(
@@ -49,6 +50,7 @@ export class ResultComponent implements OnInit, AfterContentInit, OnDestroy {
   }
 
   ngOnInit() {
+
     this.resultSubscription$ = this.result$.subscribe(
       (zones: Map<string, Zone>) => {
         if (zones !== undefined && zones !== null) {
diff --git a/src/packages/discovery/component/setting/setting.component.html b/src/packages/discovery/component/setting/setting.component.html
index 6efe31d..c07b286 100644
--- a/src/packages/discovery/component/setting/setting.component.html
+++ b/src/packages/discovery/component/setting/setting.component.html
@@ -3,7 +3,7 @@
   <of-probe-selector [preProbe]="probe" (probeSelected)="onProbeSelect($event)"></of-probe-selector>
 
   <p-blockUI [target]="df" [blocked]="!selectedProbe"></p-blockUI>
-  <p-panel #df header="{{getHeaderTitle()}}">
+  <p-panel #df [showHeader]="false">
     <of-discovery-filter [probe]="selectedProbe" [requestStart]="requestStart" (discoveryRequested)="onDiscoveryStart($event)"></of-discovery-filter>
   </p-panel>
 
diff --git a/src/packages/discovery/component/setting/setting.component.ts b/src/packages/discovery/component/setting/setting.component.ts
index 1ed9d4f..707ffbd 100644
--- a/src/packages/discovery/component/setting/setting.component.ts
+++ b/src/packages/discovery/component/setting/setting.component.ts
@@ -63,8 +63,8 @@ export class SettingComponent implements OnInit, AfterContentInit, OnDestroy, On
   }
 
   onDiscoveryStart(discoverZone: DiscoverZone) {
-    this.discoverStore.dispatch(new DiscoverStore.DiscoverZone(
-      { probeID: this.selectedProbe.probeKey, discoverZone: discoverZone }));
+    // this.discoverStore.dispatch(new DiscoverStore.DiscoverZone(
+    //   { probeID: this.selectedProbe.probeKey, discoverZone: discoverZone }));
 
     setTimeout(() => {
       this.started = true;
@@ -77,7 +77,4 @@ export class SettingComponent implements OnInit, AfterContentInit, OnDestroy, On
     this.started = false;
   }
 
-  getHeaderTitle() {
-    return this.selectedProbe ? this.selectedProbe.cidr : 'Discoverying Network.';
-  }
 }
diff --git a/src/packages/infra/component/map/map.component.html b/src/packages/infra/component/map/map.component.html
index f7992b8..d209dac 100644
--- a/src/packages/infra/component/map/map.component.html
+++ b/src/packages/infra/component/map/map.component.html
@@ -1,8 +1,9 @@
+<p-dialog [showHeader]="false" [closeOnEscape]="false" [modal]="true" header="Discovery" [width]="800" [(visible)]="display" [dismissableMask]="true">
+  <of-discovery-setting (close)="closeDialog()"></of-discovery-setting>
+</p-dialog>
+
 <div class="ui-g">
   <h1>Map</h1>
-  <p-dialog header="Discovery" [width]="800"  [(visible)]="display" [dismissableMask]="true">
-    <of-discovery-setting (close)="closeDialog()"></of-discovery-setting>
-  </p-dialog>
   <div class="ui-g-12 ui-g-nopad">
     <div class="ui-g">
       <div class="ui-g-12 ui-md-5 ui-g-nopad ui-bottom-space-10">
diff --git a/src/packages/probe/component/detail/detail.component.html b/src/packages/probe/component/detail/detail.component.html
index c952e6a..dc89f07 100644
--- a/src/packages/probe/component/detail/detail.component.html
+++ b/src/packages/probe/component/detail/detail.component.html
@@ -1,6 +1,7 @@
 <h1>Info</h1>
 
-<p-dialog header="Discovery" [width]="800"  [(visible)]="display" [dismissableMask]="true">
+<p-dialog [showHeader]="false" [closeOnEscape]="false" [modal]="true" header="Discovery" [width]="800" [(visible)]="display"
+  [dismissableMask]="true">
   <of-discovery-setting [probe]="probe" (close)="onDiscoveryClose()"></of-discovery-setting>
 </p-dialog>
 <div class="ui-g ui-bottom-space-10">