diff --git a/@overflow/discovery/component/discovery/discovery.component.html b/@overflow/discovery/component/discovery/discovery.component.html
index 9f0e5c1..402c8de 100644
--- a/@overflow/discovery/component/discovery/discovery.component.html
+++ b/@overflow/discovery/component/discovery/discovery.component.html
@@ -1,8 +1,8 @@
+<h1>Discovery</h1>
+<!-- <div class="ui-g-12">
+  <p-panel [showHeader]="false" >Temp Area</p-panel>
+</div> -->
 <div class="ui-g">
-  <div class="ui-g-12">
-    <p-panel [showHeader]="false" >Temp Area</p-panel>
-  </div>
-
   <div class="ui-g-12 ui-md-3">
     <p-accordion (onClose)="onTabClose($event)" (onOpen)="OnTabOpen($event)">
       <p-accordionTab header="Discovery Search Config Area" [selected]="true">
@@ -19,4 +19,4 @@
       <of-discovery-search-result [probe]="selectedProbe"></of-discovery-search-result>
     </p-panel>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/@overflow/discovery/component/discovery/search-config/search-config.component.html b/@overflow/discovery/component/discovery/search-config/search-config.component.html
index d546eb4..97f4153 100644
--- a/@overflow/discovery/component/discovery/search-config/search-config.component.html
+++ b/@overflow/discovery/component/discovery/search-config/search-config.component.html
@@ -1,21 +1,31 @@
-<div class="ui-g-nopad">
+<div class="ui-g">
 
   <!--<form [formGroup]="discoveryFormGroup" (ngSubmit)="discoveryStartClick()" >-->
-
-    <of-probe-selector [hidden]="requestStart" [preProbe]="probe" (probeSelected)="onProbeSelect($event)"></of-probe-selector>
-    <div class="ui-g ui-fluid" style="width:250px;margin-bottom:10px">
-      <div class="ui-g-12">
+    <div class="ui-g-12">
+      <label>Probe</label>
+    </div>
+    <div class="ui-g-12 ui-bottom-space-20">
+      <of-probe-selector [hidden]="requestStart" [preProbe]="probe" (probeSelected)="onProbeSelect($event)"></of-probe-selector>
+    </div>
+    <div class="ui-g-12">
+      <label>IP Version</label>
+    </div>
+    <div class="ui-g-12 ui-bottom-space-20">
+      <div class="ui-g-6 ui-g-nopad">
         <p-radioButton name="group1" value="0" label="IPv4" [(ngModel)]="ipVesion" inputId="opt1"></p-radioButton>
       </div>
-      <div class="ui-g-12">
+      <div class="ui-g-6 ui-g-nopad">
         <p-radioButton name="group1" value="1" label="IPv6" [(ngModel)]="ipVesion" inputId="opt2"></p-radioButton>
       </div>
     </div>
 
-    <div class="ui-g ui-fluid">
-      <span>Start IP Adress  </span>
+    <div class="ui-g-12">
+      <label>IP Adress</label>
       <input type="hidden" >
+    </div>
+    <div class="ui-g-12">
       <div class="ui-inputgroup">
+        <span style="margin-right: 18px">Start </span>
         <input type="text" pInputText placeholder="127" maxlength="3">
         <span class="ui-inputgroup-addon">.</span>
         <input type="text" pInputText placeholder="0" maxlength="3">
@@ -25,9 +35,9 @@
         <input type="text" pInputText placeholder="1" maxlength="3">
       </div>
     </div>
-    <div class="ui-g ui-fluid">
-      <span>End IP Adress  </span>
+    <div class="ui-g-12">
       <div class="ui-inputgroup">
+        <span style="margin-right: 24px">End </span>
         <input type="text" pInputText placeholder="127" maxlength="3">
         <span class="ui-inputgroup-addon">.</span>
         <input type="text" pInputText placeholder="0" maxlength="3">
@@ -37,9 +47,9 @@
         <input type="text" pInputText placeholder="1" maxlength="3">
       </div>
     </div>
-    <div class="ui-g ui-fluid">
-      <span>Exclud IP Adress  </span>
+    <div class="ui-g-12 ui-bottom-space-20">
       <div class="ui-inputgroup">
+        <span style="margin-right: 5px">Exclud </span>
         <input type="text" pInputText placeholder="127" maxlength="3">
         <span class="ui-inputgroup-addon">.</span>
         <input type="text" pInputText placeholder="0" maxlength="3">
@@ -49,25 +59,41 @@
         <input type="text" pInputText placeholder="1" maxlength="3">
       </div>
     </div>
-    <div class="ui-g ui-fluid" style="width:250px;margin-bottom:10px">
-      <div class="ui-g-12">
+    <div class="ui-g-12">
+      <label>Port type</label>
+    </div>
+    <div class="ui-g-12 ui-bottom-space-20">
+      <div class="ui-g-6 ui-g-nopad">
         <p-radioButton name="group2" value="0" label="TCP" [(ngModel)]="portType" inputId="opt3"></p-radioButton>
       </div>
-      <div class="ui-g-12">
+      <div class="ui-g-6 ui-g-nopad">
         <p-radioButton name="group2" value="1" label="UDP" [(ngModel)]="portType" inputId="opt4"></p-radioButton>
       </div>
     </div>
-
-    <div class="ui-g ui-fluid">
-      <span>Start Port : </span>
-      <p-inputMask slotChar=" " mask="9999" [(ngModel)]="startPort" placeholder="1024" [autoClear]="false"></p-inputMask> -
-      <span>End Port : </span>
-      <p-inputMask mask="9999" [(ngModel)]="endPort" placeholder="1024" [autoClear]="false"></p-inputMask>
-      <span>Exclude Port : </span>
-      <p-inputMask mask="9999" [(ngModel)]="excludePort" placeholder="1024" [autoClear]="false"></p-inputMask>
+    
+    <div class="ui-g-12">
+      <label>Port</label>
+    </div>
+    <div class="ui-g-12 ui-g-nopad ui-bottom-space-20">
+      <div class="ui-g-4">
+        <p-inputMask slotChar=" " mask="9999" [(ngModel)]="startPort" placeholder="Start" [autoClear]="false"></p-inputMask>
+      </div>
+      <div class="ui-g-4">
+        <p-inputMask mask="9999" [(ngModel)]="endPort" placeholder="End" [autoClear]="false"></p-inputMask>
+      </div>
+      <div class="ui-g-4">
+        <p-inputMask mask="9999" [(ngModel)]="excludePort" placeholder="Exclude" [autoClear]="false"></p-inputMask>
+      </div>
+    </div>
+    
+    <div class="ui-g-12">
+      <label>Service</label>
+    </div>
+    <div class="ui-g-12 ui-g-nopad">
+      <of-service-selector [disabled]="!serviceChecked" [(includeServices)]="includeServices"></of-service-selector>
+    </div>
+    <div class="ui-g-12" dir="rtl">
+       <button type="submit" label="Discovery Start" pButton class="ui-button-width-fit" ></button>
     </div>
-    <of-service-selector [disabled]="!serviceChecked" [(includeServices)]="includeServices"></of-service-selector>
-
-    <button type="submit" label="Discovery Start" pButton class="ui-button-width-fit" ></button>
   <!--</form>-->
 </div>
diff --git a/@overflow/discovery/component/discovery/search-filter/search-filter.component.html b/@overflow/discovery/component/discovery/search-filter/search-filter.component.html
index 5e10c33..ffa9f93 100644
--- a/@overflow/discovery/component/discovery/search-filter/search-filter.component.html
+++ b/@overflow/discovery/component/discovery/search-filter/search-filter.component.html
@@ -1,8 +1,11 @@
-<div class="ui-g-nopad">
-  <div class="ui-g ui-fluid">
-    <span>Start IP Adress  </span>
+<div class="ui-g">
+  <div class="ui-g-12">
+    <label>IP Adress</label>
     <input type="hidden" >
+  </div>
+  <div class="ui-g-12">
     <div class="ui-inputgroup">
+      <span style="margin-right: 18px">Start </span>
       <input type="text" pInputText placeholder="127" maxlength="3">
       <span class="ui-inputgroup-addon">.</span>
       <input type="text" pInputText placeholder="0" maxlength="3">
@@ -12,10 +15,9 @@
       <input type="text" pInputText placeholder="1" maxlength="3">
     </div>
   </div>
-  <div class="ui-g ui-fluid">
-    <span>End IP Adress  </span>
-    <input type="hidden" >
+  <div class="ui-g-12 ui-bottom-space-20">
     <div class="ui-inputgroup">
+      <span style="margin-right: 24px">End </span>
       <input type="text" pInputText placeholder="127" maxlength="3">
       <span class="ui-inputgroup-addon">.</span>
       <input type="text" pInputText placeholder="0" maxlength="3">
@@ -26,7 +28,7 @@
     </div>
   </div>
 
-  <div class="ui-g ui-fluid">
+  <div class="ui-g">
     <p-toggleButton offLabel="Oracle" onLabel="Oracle" [(ngModel)]="Oracle" [style]="{'width':'150px'}" ></p-toggleButton>
     <p-toggleButton offLabel="MYSQL" onLabel="MYSQL" [(ngModel)]="MYSQL" [style]="{'width':'150px'}"></p-toggleButton>
     <p-toggleButton offLabel="Tomcat" onLabel="Tomcat" [(ngModel)]="Tomcat" [style]="{'width':'150px'}"></p-toggleButton>
diff --git a/@overflow/discovery/component/setting/probe-selector/probe-selector.component.html b/@overflow/discovery/component/setting/probe-selector/probe-selector.component.html
index 5b466ff..3385880 100644
--- a/@overflow/discovery/component/setting/probe-selector/probe-selector.component.html
+++ b/@overflow/discovery/component/setting/probe-selector/probe-selector.component.html
@@ -4,6 +4,6 @@
               placeholder="Select a Probe"
               [(ngModel)]="selected"
               (onChange)="onProbeSelect($event)"
-              [style]="{'width':'300px'}">
+              [style]="{'width':'100%'}">
   </p-dropdown>
 </div>
diff --git a/src/assets/layout/images/favicon.png b/src/assets/layout/images/favicon.png
index 523cba3..b510041 100644
Binary files a/src/assets/layout/images/favicon.png and b/src/assets/layout/images/favicon.png differ
diff --git a/src/styles.scss b/src/styles.scss
index d556ffa..d6d5ed1 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -142,6 +142,9 @@
 .ui-bottom-space-10{
     margin-bottom: 10px;
 }
+.ui-bottom-space-20{
+    margin-bottom: 20px;
+}
 
 .ui-top-space-10{
     margin-top: 10px;