diff --git a/src/ts/containers/test/DiscoveryProbe.tsx b/src/ts/containers/test/DiscoveryProbe.tsx
index f8a86bc..2431a21 100644
--- a/src/ts/containers/test/DiscoveryProbe.tsx
+++ b/src/ts/containers/test/DiscoveryProbe.tsx
@@ -9,9 +9,9 @@ export class DiscoveryProbe extends React.Component<any, any> {
     this.state = {};
   }
 
-  componentWillMount() {
-    console.log(this.props.probe);
-  }
+  // componentWillMount() {
+  //   console.log(this.props.probe);
+  // }
 
   handle() {
     this.props.onProbeChange();
diff --git a/src/ts/containers/test/DiscoveryTable.tsx b/src/ts/containers/test/DiscoveryTable.tsx
index d94726f..946fa85 100644
--- a/src/ts/containers/test/DiscoveryTable.tsx
+++ b/src/ts/containers/test/DiscoveryTable.tsx
@@ -1,8 +1,10 @@
 import * as React from 'react';
-import {Table, Button, Input, InputProps, ButtonProps} from 'semantic-ui-react';
+import {Table, Button, Input, InputProps, ButtonProps, Dropdown } from 'semantic-ui-react';
 
 export class DiscoveryTable extends React.Component<any, any> {
 
+  private serviceTemp: any;
+
   constructor(props: any, context: any) {
     super(props, context);
     this.state = {
@@ -14,6 +16,25 @@ export class DiscoveryTable extends React.Component<any, any> {
     };
   }
 
+  componentWillMount() {
+    this.serviceTemp = [
+      { key: 'http', text: 'HTTP', value: 'http' },
+      { key: 'ftp', text: 'FTP', value: 'ftp' },
+      { key: 'snmp', text: 'SNMP', value: 'snmp' },
+      { key: 'oracle', text: 'Oracle', value: 'oracle' },
+      { key: 'mysql', text: 'MySQL', value: 'mysql' },
+      { key: 'wmi', text: 'WMI', value: 'wmi' },
+      { key: 'sql_server', text: 'SQL Server', value: 'sql_server' },
+      { key: 'stmp', text: 'STMP', value: 'stmp' },
+      { key: 'imap', text: 'IMAP', value: 'imap' },
+      { key: 'ssh', text: 'SSH', value: 'ssh' },
+      { key: 'telnet', text: 'Telnet', value: 'telnet' },
+      { key: 'casandra', text: 'Casandra', value: 'casandra' },
+      { key: 'mongodb', text: 'mongoDB', value: 'mongodb' },
+      { key: 'rmi', text: 'RMI', value: 'rmi' }
+    ];
+  }
+
   handleInput(event: React.SyntheticEvent<HTMLInputElement>, data: InputProps) {
     // console.log( data.value);
     // console.log( event.target);
@@ -70,24 +91,33 @@ export class DiscoveryTable extends React.Component<any, any> {
         <Table celled>
           <Table.Body>
             <Table.Row>
-              <Table.Cell width='1'>Start IP</Table.Cell>
-              <Table.Cell width='6'><Input tabIndex='0' size='large' placeholder='Start IP' onChange={this.handleInput.bind(this)} /></Table.Cell>
+              <Table.Cell width='2'>Zone CIDR</Table.Cell>
+              <Table.Cell width='7'><Input fluid disabled size='large' placeholder='Start IP' defaultValue='192.168.1.0/24' /></Table.Cell>
             </Table.Row>
             <Table.Row>
-              <Table.Cell>End IP</Table.Cell>
-              <Table.Cell><Input tabIndex='1' size='large' placeholder='End IP' onChange={this.handleInput.bind(this)} /></Table.Cell>
+              <Table.Cell>IP Range</Table.Cell>
+              <Table.Cell>
+                <Input tabIndex='1' size='large' placeholder='Start IP' onChange={this.handleInput.bind(this)} /> &nbsp;&nbsp;
+                <Input tabIndex='2' size='large' placeholder='End IP' onChange={this.handleInput.bind(this)} /> &nbsp;&nbsp;
+                <Input tabIndex='3' size='large' placeholder='Exclude IP' onChange={this.handleInput.bind(this)} />
+              </Table.Cell>
             </Table.Row>
             <Table.Row>
-              <Table.Cell>Exclude IP</Table.Cell>
-              <Table.Cell><Input tabIndex='2' size='large' placeholder='Exclude IP' onChange={this.handleInput.bind(this)} /></Table.Cell>
+              <Table.Cell>Port Range</Table.Cell>
+              <Table.Cell>
+                <Input tabIndex='4'  size='large' placeholder='Start Port' onChange={this.handleInput.bind(this)} /> &nbsp;&nbsp;
+                <Input tabIndex='5'  size='large' placeholder='End Port' onChange={this.handleInput.bind(this)} />
+              </Table.Cell>
             </Table.Row>
             <Table.Row>
-              <Table.Cell>Start Port</Table.Cell>
-              <Table.Cell><Input tabIndex='3' size='large' placeholder='Start Port' onChange={this.handleInput.bind(this)} /></Table.Cell>
+              <Table.Cell>Service</Table.Cell>
+              <Table.Cell>
+                  <Dropdown placeholder='Service' fluid multiple selection options={this.serviceTemp}  />
+              </Table.Cell>
             </Table.Row>
             <Table.Row>
               <Table.Cell>End Port</Table.Cell>
-              <Table.Cell><Input tabIndex='4' size='large' placeholder='End Port' onChange={this.handleInput.bind(this)} /></Table.Cell>
+              <Table.Cell><Input tabIndex='6' size='large' placeholder='End Port' onChange={this.handleInput.bind(this)} /></Table.Cell>
             </Table.Row>
           </Table.Body>
         </Table>