diff --git a/src/webui/service/templates/device/detail.html b/src/webui/service/templates/device/detail.html
index adf503952277de0e929ea5648e994bee755f9b97..f21cbbcf02903ca5faffb355f56fe9c0e10de9ee 100644
--- a/src/webui/service/templates/device/detail.html
+++ b/src/webui/service/templates/device/detail.html
@@ -43,9 +43,9 @@
 <br>
 <div class="row mb-3">
     <div class="col-sm-4">
-        <b>UUID: </b>{{ device.device_id.device_uuid.uuid }}<br><br>
-        <b>Name: </b>{{ device.name }}<br><br>
-        <b>Type: </b>{{ device.device_type }}<br><br>
+        <b>UUID: </b>{{ device.device_id.device_uuid.uuid }}<br>
+        <b>Name: </b>{{ device.name }}<br>
+        <b>Type: </b>{{ device.device_type }}<br>
         <b>Status: </b> {{ dose.Name(device.device_operational_status).replace('DEVICEOPERATIONALSTATUS_', '') }}<br>
         <b>Drivers: </b>
         <ul>
@@ -58,7 +58,7 @@
         <table class="table table-striped table-hover">
             <thead>
                 <tr>
-                    <th scope="col">Endpoint</th>
+                    <th scope="col">Endpoint UUID</th>
                     <th scope="col">Name</th>
                     <th scope="col">Type</th>
                 </tr>
diff --git a/src/webui/service/templates/link/detail.html b/src/webui/service/templates/link/detail.html
index fc865a4b99f76a05b037cad07b93a5ec7be6c1e8..16ec5470cfa428905091004affe28b8876d9c68d 100644
--- a/src/webui/service/templates/link/detail.html
+++ b/src/webui/service/templates/link/detail.html
@@ -29,16 +29,14 @@
      <br>
        <div class="row mb-3">
             <div class="col-sm-4">
-                <b>UUID: </b>{{ link.link_id.link_uuid.uuid }}<br><br>
-            </div>
-            <div class="col-sm-4">
-               <b>Name: </b>{{ link.name }}<br><br>
+               <b>UUID: </b>{{ link.link_id.link_uuid.uuid }}<br>
+               <b>Name: </b>{{ link.name }}<br>
            </div>
             <div class="col-sm-8">
                     <table class="table table-striped table-hover">
                         <thead>
                             <tr>
-                                <th scope="col">Endpoints</th>
+                                <th scope="col">Endpoint UUID</th>
                                 <th scope="col">Device</th>
                             </tr>
                         </thead>
diff --git a/src/webui/service/templates/service/detail.html b/src/webui/service/templates/service/detail.html
index 9167f0016cf0862c517aa5c070f98a7c4aac1760..67b240b3d0e79745b839c0103c40f4721e4befad 100644
--- a/src/webui/service/templates/service/detail.html
+++ b/src/webui/service/templates/service/detail.html
@@ -43,16 +43,16 @@
 
 <div class="row mb-3">
     <div class="col-sm-4">
-        <b>Context: </b> {{ service.service_id.context_id.context_uuid.uuid }}<br><br>
-        <b>UUID: </b> {{ service.service_id.service_uuid.uuid }}<br><br>
-        <b>Type: </b> {{ ste.Name(service.service_type).replace('SERVICETYPE_', '') }}<br><br>
-        <b>Status: </b> {{ sse.Name(service.service_status.service_status).replace('SERVICESTATUS_', '') }}<br><br>
+        <b>Context: </b> {{ service.service_id.context_id.context_uuid.uuid }}<br>
+        <b>UUID: </b> {{ service.service_id.service_uuid.uuid }}<br>
+        <b>Type: </b> {{ ste.Name(service.service_type).replace('SERVICETYPE_', '') }}<br>
+        <b>Status: </b> {{ sse.Name(service.service_status.service_status).replace('SERVICESTATUS_', '') }}<br>
     </div>
     <div class="col-sm-8">
         <table class="table table-striped table-hover">
             <thead>
                 <tr>
-                    <th scope="col">Endpoints</th>
+                    <th scope="col">Endpoint UUID</th>
                     <th scope="col">Device</th>
                 </tr>
             </thead>
diff --git a/src/webui/service/templates/slice/detail.html b/src/webui/service/templates/slice/detail.html
index 9bd4eb0d90ca07daba8971e1d60cc6a30a4dc8f5..404dede394fbbc4b30d181c1872c989686c4b17a 100644
--- a/src/webui/service/templates/slice/detail.html
+++ b/src/webui/service/templates/slice/detail.html
@@ -44,16 +44,16 @@
 
 <div class="row mb-3">
     <div class="col-sm-4">
-        <b>Context: </b> {{ slice.slice_id.context_id.context_uuid.uuid }}<br><br>
-        <b>UUID: </b> {{ slice.slice_id.slice_uuid.uuid }}<br><br>
-        <b>Owner: </b> {{ slice.slice_owner.owner_uuid.uuid }}<br><br>
-        <b>Status: </b> {{ sse.Name(slice.slice_status.slice_status).replace('SLICESTATUS_', '') }}<br><br>
+        <b>Context: </b> {{ slice.slice_id.context_id.context_uuid.uuid }}<br>
+        <b>UUID: </b> {{ slice.slice_id.slice_uuid.uuid }}<br>
+        <b>Owner: </b> {{ slice.slice_owner.owner_uuid.uuid }}<br>
+        <b>Status: </b> {{ sse.Name(slice.slice_status.slice_status).replace('SLICESTATUS_', '') }}<br>
     </div>
     <div class="col-sm-8">
         <table class="table table-striped table-hover">
             <thead>
                 <tr>
-                    <th scope="col">Endpoints</th>
+                    <th scope="col">Endpoint UUID</th>
                     <th scope="col">Device</th>
                 </tr>
             </thead>