diff --git a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmdetails/alarmdetails.component.html b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmdetails/alarmdetails.component.html
index 72c1fb3..41591bc 100644
--- a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmdetails/alarmdetails.component.html
+++ b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmdetails/alarmdetails.component.html
@@ -27,48 +27,48 @@
             <table>
               <tbody>
               <tr>
-                <td class="label" width="110">Description:</td>
+                <td class="label" width="110">Description</td>
                 <td class="value" width="80">{{detailsData.alarmDesc}}</td>
               </tr>
               <tr>
-                <td class="label" width="110">Device ID :</td>
+                <td class="label" width="110">Device ID</td>
                 <td class="value" width="80">{{detailsData.alarmDeviceId}}</td>
               </tr>
               <tr>
-                <td class="label" width="110">Alarm source :</td>
+                <td class="label" width="110">Alarm source</td>
                 <td class="value" width="80">{{detailsData.alarmSource}}</td>
               </tr>
               <tr>
-                <td class="label" width="110">Time raised :</td>
+                <td class="label" width="110">Time raised</td>
                 <td class="value" width="80">{{detailsData.alarmTimeRaised}}</td>
               </tr>
               <tr>
-                <td class="label" width="110">Time updated :</td>
+                <td class="label" width="110">Time updated</td>
                 <td class="value" width="80">{{detailsData.alarmTimeUpdated}}</td>
               </tr>
               <tr>
-                <td class="label" width="110">Cleared :</td>
+                <td class="label" width="110">Cleared</td>
                 <td class="value" width="80">{{detailsData.alarmCleared}}</td>
               </tr>
               <tr>
-                <td class="label" width="110">Time cleared :</td>
+                <td class="label" width="110">Time cleared</td>
                 <td class="value" width="80">{{detailsData.alarmTimeCleared}}</td>
               </tr>
               <tr>
-                <td class="label" width="110">Severity :</td>
-                <td class="value" width="80">{{detailsData.alarmSeverity}}</td>
+                <td class="label" width="110">Severity</td>
+                <td width="80" [ngClass]="[detailsData.alarmSeverity ? detailsData.alarmSeverity:'', 'severity', 'value']">{{detailsData.alarmSeverity}}</td>
               </tr>
               <hr>
               <tr>
-                <td class="label" width="110">Service affecting :</td>
+                <td class="label" width="110">Service affecting</td>
                 <td class="value" width="80">{{detailsData.alarmServiceAffecting}}</td>
               </tr>
               <tr>
-                <td class="label" width="110">Acknowledged :</td>
+                <td class="label" width="110">Acknowledged</td>
                 <td class="value" width="80">{{detailsData.alarmAcknowledged}}</td>
               </tr>
               <tr>
-                <td class="label" width="110">Assigned User :</td>
+                <td class="label" width="110">Assigned User</td>
                 <td class="value" width="80">{{detailsData.alarmAssignedUser}}</td>
               </tr>
               </tbody>
diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/details/details.component.html b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/details/details.component.html
index d224db5..02d3285 100644
--- a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/details/details.component.html
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/details/details.component.html
@@ -35,7 +35,7 @@
             create a cell for the name and another for the value -->
                 <tr *ngFor="let p of showDetails?.propOrder">
                     <td *ngIf="showDetails?.propLabels[p] !== '-'"
-                        class="label">{{showDetails?.propLabels[p]}} :</td>
+                        class="label">{{showDetails?.propLabels[p]}}</td>
                     <td *ngIf="showDetails?.propLabels[p] !== '-'"
                         class="value">{{ showDetails?.propValues[p]}}</td>
                     <!-- If the label is '-' then insert a horiz line -->
diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/topopanel.base.ts b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/topopanel.base.ts
index 52966ab..919a873 100644
--- a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/topopanel.base.ts
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/panel/topopanel.base.ts
@@ -78,7 +78,7 @@
             tr.append('td').attr('class', cls).text(txt);
         }
 
-        addCell('label', lab + ' :');
+        addCell('label', lab);
         addCell('value', value);
     }
 
diff --git a/web/gui2/src/main/webapp/app/view/apps/appsdetails/appsdetails.component.html b/web/gui2/src/main/webapp/app/view/apps/appsdetails/appsdetails.component.html
index 6671601..8b19df7 100644
--- a/web/gui2/src/main/webapp/app/view/apps/appsdetails/appsdetails.component.html
+++ b/web/gui2/src/main/webapp/app/view/apps/appsdetails/appsdetails.component.html
@@ -27,27 +27,27 @@
                     <table class="app-props">
                         <tbody>
                             <tr>
-                                <td class="label">{{ lionFn('app_id') }}:</td>
+                                <td class="label">{{ lionFn('app_id') }}</td>
                                 <td class="value">{{ id }}</td>
                             </tr>
                             <tr>
-                                <td class="label">{{ lionFn('state') }}:</td>
+                                <td class="label">{{ lionFn('state') }}</td>
                                 <td class="value">{{ detailsData.state }}</td>
                             </tr>
                             <tr>
-                                <td class="label">{{ lionFn('category') }}:</td>
+                                <td class="label">{{ lionFn('category') }}</td>
                                 <td class="value">{{ detailsData.category }}</td>
                             </tr>
                             <tr>
-                                <td class="label">{{ lionFn('version') }}:</td>
+                                <td class="label">{{ lionFn('version') }}</td>
                                 <td class="value">{{ detailsData.version }}</td>
                             </tr>
                             <tr>
-                                <td class="label">{{ lionFn('origin') }}:</td>
+                                <td class="label">{{ lionFn('origin') }}</td>
                                 <td class="value">{{ detailsData.origin }}</td>
                             </tr>
                             <tr>
-                                <td class="label">{{ lionFn('role') }}:</td>
+                                <td class="label">{{ lionFn('role') }}</td>
                                 <td class="value">{{ detailsData.role }}</td>
                             </tr>
                         </tbody>
diff --git a/web/gui2/src/main/webapp/app/view/apps/appsdetails/appsdetails.component.spec.ts b/web/gui2/src/main/webapp/app/view/apps/appsdetails/appsdetails.component.spec.ts
index ed45a02..f348046 100644
--- a/web/gui2/src/main/webapp/app/view/apps/appsdetails/appsdetails.component.spec.ts
+++ b/web/gui2/src/main/webapp/app/view/apps/appsdetails/appsdetails.component.spec.ts
@@ -153,7 +153,7 @@
         const appDe: DebugElement = fixture.debugElement;
         const divDe = appDe.query(By.css('div.top-content div.right table.app-props'));
         const div: HTMLElement = divDe.nativeElement;
-        expect(div.textContent).toEqual('%app_id%:%state%:%category%:%version%:%origin%:%role%:');
+        expect(div.textContent).toEqual('%app_id%%state%%category%%version%%origin%%role%');
     });
 
     it('should have an a inside an div.app-url inside a div.top-content', () => {
diff --git a/web/gui2/src/main/webapp/app/view/device/devicedetails/devicedetails.component.html b/web/gui2/src/main/webapp/app/view/device/devicedetails/devicedetails.component.html
index 034b63b..c0df11d 100644
--- a/web/gui2/src/main/webapp/app/view/device/devicedetails/devicedetails.component.html
+++ b/web/gui2/src/main/webapp/app/view/device/devicedetails/devicedetails.component.html
@@ -30,23 +30,23 @@
             <table>
               <tbody>
                 <tr>
-                  <td class="label" width="110">URI :</td>
+                  <td class="label" width="110">URI</td>
                   <td class="value" width="80">{{detailsData.id}}</td>
                 </tr>
                 <tr>
-                  <td class="label" width="110">Type :</td>
+                  <td class="label" width="110">Type</td>
                   <td class="value" width="80">{{detailsData.type}}</td>
                 </tr>
                 <tr>
-                  <td class="label" width="110">Master ID :</td>
+                  <td class="label" width="110">Master ID</td>
                   <td class="value" width="80">{{detailsData.masterid}}</td>
                 </tr>
                 <tr>
-                  <td class="label" width="110">Chassis ID :</td>
+                  <td class="label" width="110">Chassis ID</td>
                   <td class="value" width="80">{{detailsData.chassisid}}</td>
                 </tr>
                 <tr>
-                  <td class="label" width="110">Vendor :</td>
+                  <td class="label" width="110">Vendor</td>
                   <td class="value" width="80">{{detailsData.mfr}}</td>
                 </tr>
               </tbody>
@@ -56,23 +56,23 @@
             <table>
               <tbody>
                 <tr>
-                  <td class="label" width="110">H/W Version :</td>
+                  <td class="label" width="110">H/W Version</td>
                   <td class="value" width="80">{{detailsData.hw}}</td>
                 </tr>
                 <tr>
-                  <td class="label" width="110">S/W Version :</td>
+                  <td class="label" width="110">S/W Version</td>
                   <td class="value" width="80">{{detailsData.sw}}</td>
                 </tr>
                 <tr>
-                  <td class="label" width="110">Protocol :</td>
+                  <td class="label" width="110">Protocol</td>
                   <td class="value" width="80">{{detailsData.protocol}}</td>
                 </tr>
                 <tr>
-                  <td class="label" width="110">Serial # :</td>
+                  <td class="label" width="110">Serial #</td>
                   <td class="value" width="80">{{detailsData.serial}}</td>
                 </tr>
                 <tr>
-                  <td class="label" width="110">Pipeconf :</td>
+                  <td class="label" width="110">Pipeconf</td>
                   <td class="value" width="80">{{detailsData.pipeconf}}</td>
                 </tr>
               </tbody>
diff --git a/web/gui2/src/main/webapp/app/view/device/devicedetails/devicedetails.component.spec.ts b/web/gui2/src/main/webapp/app/view/device/devicedetails/devicedetails.component.spec.ts
index d169f34..e3be82b 100644
--- a/web/gui2/src/main/webapp/app/view/device/devicedetails/devicedetails.component.spec.ts
+++ b/web/gui2/src/main/webapp/app/view/device/devicedetails/devicedetails.component.spec.ts
@@ -121,14 +121,14 @@
         const devDe: DebugElement = fixture.debugElement;
         const divDe = devDe.query(By.css('div.top-content div.top-tables div.left'));
         const div: HTMLElement = divDe.nativeElement;
-        expect(div.textContent).toEqual('URI :Type :Master ID :Chassis ID :Vendor :');
+        expect(div.textContent).toEqual('URITypeMaster IDChassis IDVendor');
     });
 
     it('should have a dev.right inside a div.top-tables inside a div.top-content', () => {
         const devDe: DebugElement = fixture.debugElement;
         const divDe = devDe.query(By.css('div.top-content div.top-tables div.right'));
         const div: HTMLElement = divDe.nativeElement;
-        expect(div.textContent).toEqual('H/W Version :S/W Version :Protocol :Serial # :Pipeconf :');
+        expect(div.textContent).toEqual('H/W VersionS/W VersionProtocolSerial #Pipeconf');
     });
 
     it('should have a div.bottom inside a div.container', () => {
diff --git a/web/gui2/src/main/webapp/app/view/flow/flowdetails/flowdetails/flowdetails.component.html b/web/gui2/src/main/webapp/app/view/flow/flowdetails/flowdetails/flowdetails.component.html
index 05d0a47..336db57 100644
--- a/web/gui2/src/main/webapp/app/view/flow/flowdetails/flowdetails/flowdetails.component.html
+++ b/web/gui2/src/main/webapp/app/view/flow/flowdetails/flowdetails/flowdetails.component.html
@@ -28,55 +28,55 @@
                     <table>
                         <tbody>
                             <tr>
-                                <td class="label">{{ lionFn('flowId') }} :</td>
+                                <td class="label">{{ lionFn('flowId') }}</td>
                                 <td class="value">{{ flowId }}</td>
                             </tr>
                             <tr>
-                                <td class="label">{{ lionFn('state') }} :</td>
+                                <td class="label">{{ lionFn('state') }}</td>
                                 <td class="value">{{ detailsData.state }}</td>
                             </tr>
                             <tr>
-                                <td class="label">{{ lionFn('bytes') }} :</td>
+                                <td class="label">{{ lionFn('bytes') }}</td>
                                 <td class="value">{{ detailsData.bytes }}</td>
                             </tr>
                             <tr>
-                                <td class="label">{{ lionFn('packets') }} :</td>
+                                <td class="label">{{ lionFn('packets') }}</td>
                                 <td class="value">{{ detailsData.packets }}</td>
                             </tr>
                             <tr>
-                                <td class="label">{{ lionFn('duration') }} :</td>
+                                <td class="label">{{ lionFn('duration') }}</td>
                                 <td class="value">{{ detailsData.duration }}</td>
                             </tr>
                             <tr>
-                                <td class="label">{{ lionFn('priority') }} :</td>
+                                <td class="label">{{ lionFn('priority') }}</td>
                                 <td class="value">{{ detailsData.priority }}</td>
                             </tr>
                             <tr>
-                                <td class="label">{{ lionFn('tableName') }} :</td>
+                                <td class="label">{{ lionFn('tableName') }}</td>
                                 <td class="value">{{ detailsData.tableName }}</td>
                             </tr>
                             <tr>
-                                <td class="label">{{ lionFn('appName') }} :</td>
+                                <td class="label">{{ lionFn('appName') }}</td>
                                 <td class="value">{{ detailsData.appName }}</td>
                             </tr>
                             <tr>
-                                <td class="label">{{ lionFn('appId') }} :</td>
+                                <td class="label">{{ lionFn('appId') }}</td>
                                 <td class="value">{{ detailsData.appId }}</td>
                             </tr>
                             <tr>
-                                <td class="label">{{ lionFn('groupId') }} :</td>
+                                <td class="label">{{ lionFn('groupId') }}</td>
                                 <td class="value">{{ detailsData.groupId }}</td>
                             </tr>
                             <tr>
-                                <td class="label">{{ lionFn('idleTimeout') }} :</td>
+                                <td class="label">{{ lionFn('idleTimeout') }}</td>
                                 <td class="value">{{ detailsData.idleTimeout }}</td>
                             </tr>
                             <tr>
-                                <td class="label">{{ lionFn('hardTimeout') }} :</td>
+                                <td class="label">{{ lionFn('hardTimeout') }}</td>
                                 <td class="value">{{ detailsData.hardTimeout }}</td>
                             </tr>
                             <tr>
-                                <td class="label">{{ lionFn('permanent') }} :</td>
+                                <td class="label">{{ lionFn('permanent') }}</td>
                                 <td class="value">{{ detailsData.permanent }}</td>
                             </tr>
                         </tbody>
@@ -88,7 +88,7 @@
                     <table>
                         <tbody>
                             <tr>
-                                <td class="label">ETH_TYPE :</td>
+                                <td class="label">ETH_TYPE</td>
                                 <td class="value">{{ detailsData.selector }}</td>
                             </tr>
                         </tbody>
@@ -100,7 +100,7 @@
                     <table>
                         <tbody>
                             <tr>
-                                <td class="label">[imm]OUTPUT :</td>
+                                <td class="label">[imm]OUTPUT</td>
                                 <td class="value">{{ immed(detailsData.treatment) }}</td>
                             </tr>
                             <tr>
diff --git a/web/gui2/src/main/webapp/app/view/host/hostdetails/hostdetails.component.html b/web/gui2/src/main/webapp/app/view/host/hostdetails/hostdetails.component.html
index c7c9dba..2b8f5b1 100644
--- a/web/gui2/src/main/webapp/app/view/host/hostdetails/hostdetails.component.html
+++ b/web/gui2/src/main/webapp/app/view/host/hostdetails/hostdetails.component.html
@@ -29,15 +29,15 @@
                     <table>
                         <tbody>
                             <tr>
-                                <td class="label" width="110">Host ID :</td>
+                                <td class="label" width="110">Host ID</td>
                                 <td class="value" width="80">{{detailsData.id}}</td>
                             </tr>
                             <tr>
-                                <td class="label" width="110">IP Address :</td>
+                                <td class="label" width="110">IP Address</td>
                                 <td class="value" width="80">{{detailsData.ips}}</td>
                             </tr>
                             <tr>
-                                <td class="label" width="110">MAC Address :</td>
+                                <td class="label" width="110">MAC Address</td>
                                 <td class="value" width="80">{{detailsData.mac}}</td>
                             </tr>
                         </tbody>
@@ -47,15 +47,15 @@
                     <table>
                         <tbody>
                             <tr>
-                                <td class="label" width="110">VLAN :</td>
+                                <td class="label" width="110">VLAN</td>
                                 <td class="value" width="80">{{detailsData.vlan}}</td>
                             </tr>
                             <tr>
-                                <td class="label" width="110">Configured :</td>
+                                <td class="label" width="110">Configured</td>
                                 <td class="value" width="80">{{detailsData.configured}}</td>
                             </tr>
                             <tr>
-                                <td class="label" width="110">Location :</td>
+                                <td class="label" width="110">Location</td>
                                 <td class="value" width="80">{{detailsData.location}}</td>
                             </tr>
                         </tbody>
diff --git a/web/gui2/src/main/webapp/app/view/pipeconf/pipeconfdetails/pipeconfdetails.component.html b/web/gui2/src/main/webapp/app/view/pipeconf/pipeconfdetails/pipeconfdetails.component.html
index 399ad28..011aacf 100644
--- a/web/gui2/src/main/webapp/app/view/pipeconf/pipeconfdetails/pipeconfdetails.component.html
+++ b/web/gui2/src/main/webapp/app/view/pipeconf/pipeconfdetails/pipeconfdetails.component.html
@@ -30,20 +30,18 @@
                         <table>
                             <tbody>
                             <tr>
-                                <td class="label" width="110">Name :</td>
+                                <td class="label" width="110">Name</td>
                                 <td class="value"
                                     width="80">{{pipeconfTable?.name}}</td>
-                                <td class="label" width="110">Support Aging :
-                                </td>
+                                <td class="label" width="110">Support Aging</td>
                                 <td class="value"
                                     width="80">{{pipeconfTable?.supportAging}}</td>
                             </tr>
                             <tr>
-                                <td class="label" width="110">Has counters :
-                                </td>
+                                <td class="label" width="110">Has counters</td>
                                 <td class="value"
                                     width="80">{{pipeconfTable?.hasCounters}}</td>
-                                <td class="label" width="110">Max entries :</td>
+                                <td class="label" width="110">Max entries</td>
                                 <td class="value"
                                     width="80">{{pipeconfTable?.maxSize}}</td>
                             </tr>
diff --git a/web/gui2/src/main/webapp/app/view/port/portdetails/portdetails.component.html b/web/gui2/src/main/webapp/app/view/port/portdetails/portdetails.component.html
index d4b59be..7f6433d 100644
--- a/web/gui2/src/main/webapp/app/view/port/portdetails/portdetails.component.html
+++ b/web/gui2/src/main/webapp/app/view/port/portdetails/portdetails.component.html
@@ -29,23 +29,23 @@
                         <table>
                             <tbody>
                                 <tr>
-                                    <td class="label" width="110">ID :</td>
+                                    <td class="label" width="110">ID</td>
                                     <td class="value" width="80">{{detailsData.id}}</td>
                                 </tr>
                                 <tr>
-                                    <td class="label" width="110">Device :</td>
+                                    <td class="label" width="110">Device</td>
                                     <td class="value" width="80">{{detailsData.devId}}</td>
                                 </tr>
                                 <tr>
-                                    <td class="label" width="110">Type :</td>
+                                    <td class="label" width="110">Type</td>
                                     <td class="value" width="80">{{detailsData.type}}</td>
                                 </tr>
                                 <tr>
-                                    <td class="label" width="110">Speed :</td>
+                                    <td class="label" width="110">Speed</td>
                                     <td class="value" width="80">{{detailsData.speed}}</td>
                                 </tr>
                                 <tr>
-                                    <td class="label" width="110">Enabled :</td>
+                                    <td class="label" width="110">Enabled</td>
                                     <td class="value" width="80">{{detailsData.enabled}}</td>
                                 </tr>
                             </tbody>
diff --git a/web/gui2/src/main/webapp/app/view/port/portdetails/portdetails.component.spec.ts b/web/gui2/src/main/webapp/app/view/port/portdetails/portdetails.component.spec.ts
index 9cae299..32a50e92 100644
--- a/web/gui2/src/main/webapp/app/view/port/portdetails/portdetails.component.spec.ts
+++ b/web/gui2/src/main/webapp/app/view/port/portdetails/portdetails.component.spec.ts
@@ -120,6 +120,6 @@
         const portDe: DebugElement = fixture.debugElement;
         const divDe = portDe.query(By.css('div.top-content div.top-tables div.left'));
         const div: HTMLElement = divDe.nativeElement;
-        expect(div.textContent).toEqual('ID :Device :Type :Speed :Enabled :');
+        expect(div.textContent).toEqual('IDDeviceTypeSpeedEnabled');
     });
 });
diff --git a/web/gui2/src/main/webapp/app/view/settings/settingsdetails/settingsdetails.component.html b/web/gui2/src/main/webapp/app/view/settings/settingsdetails/settingsdetails.component.html
index eef4ba2..8fdeca4 100644
--- a/web/gui2/src/main/webapp/app/view/settings/settingsdetails/settingsdetails.component.html
+++ b/web/gui2/src/main/webapp/app/view/settings/settingsdetails/settingsdetails.component.html
@@ -25,27 +25,27 @@
                 <table>
                     <tbody>
                         <tr>
-                            <td class="label">Component: </td>
+                            <td class="label">Component</td>
                             <td class="value">{{ settingsDetails?.fqComponent }}</td>
                         </tr>
                         <tr>
-                            <td class="label">Property: </td>
+                            <td class="label">Property</td>
                             <td class="value">{{ settingsDetails?.prop }}</td>
                         </tr>
                         <tr>
-                            <td class="label">Type: </td>
+                            <td class="label">Type</td>
                             <td class="value">{{ settingsDetails?.type }}</td>
                         </tr>
                         <tr>
-                            <td class="label">Value: </td>
+                            <td class="label">Value</td>
                             <td class="value">{{ settingsDetails?.value }}</td>
                         </tr>
                         <tr>
-                            <td class="label">Default: </td>
+                            <td class="label">Default</td>
                             <td class="value">{{ settingsDetails?.defValue }}</td>
                         </tr>
                         <tr>
-                            <td class="label">Description: </td>
+                            <td class="label">Description</td>
                             <td class="value">{{ settingsDetails?.desc }}</td>
                         </tr>
                     </tbody>