diff --git a/@overflow/infra/component/infra-map.component.html b/@overflow/infra/component/infra-map.component.html
index d249dd6..343b82d 100644
--- a/@overflow/infra/component/infra-map.component.html
+++ b/@overflow/infra/component/infra-map.component.html
@@ -3,7 +3,8 @@
   <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">
-        <button pButton type="button" class="ui-button-large ui-button-width-fit" icon="ui-icon-play-arrow" label="Discovery" (click)="onDiscovery()"></button>
+        <button pButton type="button" class="ui-button-large ui-button-width-fit" 
+        icon="ui-icon-play-arrow" label="Discovery" (click)="discovery.emit()"></button>
       </div>
       <div class="ui-g-12 ui-md-7 ui-g-nopad">
         <div style="float: right;">
diff --git a/@overflow/infra/component/infra-map.component.ts b/@overflow/infra/component/infra-map.component.ts
index a9d10de..8b887fd 100644
--- a/@overflow/infra/component/infra-map.component.ts
+++ b/@overflow/infra/component/infra-map.component.ts
@@ -32,6 +32,8 @@ export class InfraMapComponent implements OnInit {
   probeHosts: ProbeHost[];
   probeTabIdx: number;
 
+  @Output() discovery = new EventEmitter();
+
   constructor(
     private store: Store<any>,
     private probeHostService: ProbeHostService,
@@ -110,7 +112,4 @@ export class InfraMapComponent implements OnInit {
     ).subscribe();
   }
 
-  onDiscovery() {
-
-  }
 }
diff --git a/src/app/pages/infra/infra-page.component.html b/src/app/pages/infra/infra-page.component.html
index 12f1715..9b90929 100644
--- a/src/app/pages/infra/infra-page.component.html
+++ b/src/app/pages/infra/infra-page.component.html
@@ -2,7 +2,7 @@
     <div class="ui-g">
         <div class="ui-g-12">
             <div class="card no-margin">
-                <of-infra-map></of-infra-map>
+                <of-infra-map (discovery)="onDiscovery($event)"></of-infra-map>
             </div>
         </div>
     </div>
diff --git a/src/app/pages/infra/infra-page.component.ts b/src/app/pages/infra/infra-page.component.ts
index c64fe7f..caf2d87 100644
--- a/src/app/pages/infra/infra-page.component.ts
+++ b/src/app/pages/infra/infra-page.component.ts
@@ -15,4 +15,7 @@ export class InfraPageComponent implements OnInit {
 
   ngOnInit() {
   }
+  onDiscovery() {
+    this.router.navigate(['discovery']);
+  }
 }