diff --git a/application/Espo/Resources/i18n/en_US/EntityManager.json b/application/Espo/Resources/i18n/en_US/EntityManager.json
index 8ab8cf35c4..404b5fb2ee 100644
--- a/application/Espo/Resources/i18n/en_US/EntityManager.json
+++ b/application/Espo/Resources/i18n/en_US/EntityManager.json
@@ -15,6 +15,7 @@
         "stream": "Stream",
         "label": "Label",
         "linkType": "Link Type",
+        "entity": "Entity",
         "entityForeign": "Foreign Entity",
         "linkForeign": "Foreign Link",
         "link": "Link",
diff --git a/client/res/templates/admin/link-manager/index.tpl b/client/res/templates/admin/link-manager/index.tpl
index 6219ef62e1..28b538582c 100644
--- a/client/res/templates/admin/link-manager/index.tpl
+++ b/client/res/templates/admin/link-manager/index.tpl
@@ -20,11 +20,29 @@
 
 <table class="table">
     {{#unless linkDataList.length}}
-     <tr>
+    <tr>
         <td>
             {{translate 'No Data'}}
         </td>
-     </tr>
+    </tr>
+    {{else}}
+    <thead>
+        <tr>
+            <th width="15%" align="left">{{translate 'entity' category='fields' scope='EntityManager'}}</th>
+            <th width="15%" align="left">{{translate 'linkForeign' category='fields' scope='EntityManager'}}</th>
+            <th width="10%" align="center" style="text-align: center">
+                {{translate 'linkType' category='fields' scope='EntityManager'}}
+            </th>
+            <th width="15%" align="right" style="text-align: right">
+                {{translate 'link' category='fields' scope='EntityManager'}}
+            </th>
+            <th width="15%" align="right" style="text-align: right">
+                {{translate 'entityForeign' category='fields' scope='EntityManager'}}
+            </th>
+        </tr>
+    </thead>
+
+    </tr>
     {{/unless}}
     {{#each linkDataList}}
     <tr data-link="{{link}}">
@@ -32,7 +50,9 @@
             {{translate entity category='scopeNames'}}
         </td>
         <td width="15%" align="left">
-            {{linkForeign}}
+            <span title="{{translate linkForeign category='links' scope=entityForeign}}">
+                {{linkForeign}}
+            </span>
         </td>
         <td width="10%" align="center">
             <strong>
@@ -40,7 +60,9 @@
             </strong>
         </td>
         <td width="15%" align="right">
-            {{link}}
+            <span title="{{translate link category='links' scope=entity}}">
+                {{link}}
+            </span>
         </td>
         <td width="15%" align="right">
             {{translate entityForeign category='scopeNames'}}