diff --git a/src/webui/service/templates/device/detail.html b/src/webui/service/templates/device/detail.html
index 69ca93727310db7f89034f56510ceb5df504083f..6b39e221758ebc5dd0c22f6284d449748a3577b5 100644
--- a/src/webui/service/templates/device/detail.html
+++ b/src/webui/service/templates/device/detail.html
@@ -17,7 +17,7 @@
    {% extends 'base.html' %}
    
    {% block content %}
-       <h1>Device {{ device.device_id.device_uuid.uuid }}</h1>
+       <h1>Device {{ device.name }} ({{ device.device_id.device_uuid.uuid }})</h1>
    
        <div class="row mb-3">
            <div class="col-sm-3">
@@ -44,6 +44,7 @@
        <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>Status: </b> {{ dose.Name(device.device_operational_status).replace('DEVICEOPERATIONALSTATUS_', '') }}<br>
                 <b>Drivers: </b>
diff --git a/src/webui/service/templates/device/home.html b/src/webui/service/templates/device/home.html
index 2c108add96df7de413f5310d4bd9e3c3fb69a6ed..7b4437ccecd0c4d4948edba862666ee83c01e4cf 100644
--- a/src/webui/service/templates/device/home.html
+++ b/src/webui/service/templates/device/home.html
@@ -42,7 +42,8 @@
     <table class="table table-striped table-hover">
         <thead>
           <tr>
-            <th scope="col">#</th>
+            <th scope="col">UUID</th>
+            <th scope="col">Name</th>
             <th scope="col">Type</th>
             <th scope="col">Endpoints</th>
             <th scope="col">Drivers</th>
@@ -56,9 +57,10 @@
                 {% for device in devices %}
                 <tr>
                     <td>
-                        <!-- <a href="{{ url_for('device.detail', device_uuid=device.device_id.device_uuid.uuid) }}"> -->
-                            {{ device.device_id.device_uuid.uuid }}
-                        <!-- </a> -->
+                        {{ device.device_id.device_uuid.uuid }}
+                    </td>
+                    <td>
+                        {{ device.name }}
                     </td>
                     <td>
                         {{ device.device_type }}
diff --git a/src/webui/service/templates/link/detail.html b/src/webui/service/templates/link/detail.html
index 7df9ddce6bdddd511f3b50313cafa1374990b99e..fc865a4b99f76a05b037cad07b93a5ec7be6c1e8 100644
--- a/src/webui/service/templates/link/detail.html
+++ b/src/webui/service/templates/link/detail.html
@@ -16,7 +16,7 @@
    {% extends 'base.html' %}
    
    {% block content %}
-    <h1>Link {{ link.link_id.link_uuid.uuid }}</h1>
+    <h1>Link {{ link.name }} ({{ link.link_id.link_uuid.uuid }})</h1>
     <div class="row mb-3">
           <div class="col-sm-3">
                <button type="button" class="btn btn-success" onclick="window.location.href='{{ url_for('link.home') }}'">
@@ -31,6 +31,9 @@
             <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>
+           </div>
             <div class="col-sm-8">
                     <table class="table table-striped table-hover">
                         <thead>
diff --git a/src/webui/service/templates/link/home.html b/src/webui/service/templates/link/home.html
index 77d00d34185ac45ada0ed6d8e9915c0b2f3ad9c0..16fe36e1f4a70ce76ff32257a508acc841248605 100644
--- a/src/webui/service/templates/link/home.html
+++ b/src/webui/service/templates/link/home.html
@@ -27,7 +27,7 @@
                </a> -->
            </div>
            <div class="col">
-               {{ links | length }} links found</i>
+               {{ links | length }} links found in context <i>{{ session['context_uuid'] }}</i>
            </div>
            <!-- <div class="col">
                <form>
@@ -42,7 +42,8 @@
        <table class="table table-striped table-hover">
            <thead>
              <tr>
-               <th scope="col">#</th>
+               <th scope="col">UUID</th>
+               <th scope="col">Name</th>
                <th scope="col">Endpoints</th>
                <th scope="col"></th>
              </tr>
@@ -52,11 +53,12 @@
                    {% for link in links %}
                    <tr>
                        <td>
-                           <!-- <a href="#"> -->
-                               {{ link.link_id.link_uuid.uuid }}
-                           <!-- </a> -->
+                            {{ link.link_id.link_uuid.uuid }}
                        </td>
-   
+                       <td>
+                            {{ link.name }}
+                        </td>
+
                        <td>
                            <ul>
                                {% for end_point in link.link_endpoint_ids %}