diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json
index 2b8f63c243..33242ccdcf 100644
--- a/platform/commonUI/general/bundle.json
+++ b/platform/commonUI/general/bundle.json
@@ -196,7 +196,7 @@
             {
                 "key": "label",
                 "templateUrl": "templates/label.html",
-                "uses": [ "type" ],
+                "uses": [ "type", "location" ],
                 "gestures": [ "drag", "menu", "info" ]
             },
             {
diff --git a/platform/commonUI/general/res/templates/label.html b/platform/commonUI/general/res/templates/label.html
index bfa7bd56ff..a11ad42646 100644
--- a/platform/commonUI/general/res/templates/label.html
+++ b/platform/commonUI/general/res/templates/label.html
@@ -24,5 +24,10 @@
         {{type.getGlyph()}}
         <span class='ui-symbol icon alert hidden'>!</span>
     </span>
-    <span class='title-label'>{{model.name}}</span>
+    <span class='title-label'>
+        {{model.name}}
+        <span>{{model.location}}</span>
+        <span>{{location.getLocation()}}</span>
+        <span ng-show="{{location.isLink}}">(link)</span>
+    </span>
 </span>
diff --git a/platform/commonUI/general/res/templates/tree-node.html b/platform/commonUI/general/res/templates/tree-node.html
index f584befb1a..1228604b2e 100644
--- a/platform/commonUI/general/res/templates/tree-node.html
+++ b/platform/commonUI/general/res/templates/tree-node.html
@@ -22,29 +22,29 @@
 <span ng-controller="ToggleController as toggle">
     <span ng-controller="TreeNodeController as treeNode">
         <span
-	        class="tree-item menus-to-left"
-	        ng-class="{selected: treeNode.isSelected()}"
-	        >
+            class="tree-item menus-to-left"
+            ng-class="{selected: treeNode.isSelected()}"
+            >
             <span
-	            class='ui-symbol view-control'
-				ng-click="toggle.toggle(); treeNode.trackExpansion()"
-				ng-if="model.composition !== undefined"
-				>
+                class='ui-symbol view-control'
+                ng-click="toggle.toggle(); treeNode.trackExpansion()"
+                ng-if="model.composition !== undefined"
+                >
                 {{toggle.isActive() ? "v" : ">"}}
             </span>
             <mct-representation
-				key="'label'"
-				mct-object="domainObject"
-				ng-model="ngModel"
-				ng-click="ngModel.selectedObject = domainObject"
-				>
+                key="'label'"
+                mct-object="domainObject"
+                ng-model="ngModel"
+                ng-click="ngModel.selectedObject = domainObject"
+                >
             </mct-representation>
         </span>
         <span
-			class="tree-item-subtree"
-			ng-show="toggle.isActive()"
-			ng-if="model.composition !== undefined"
-			>
+            class="tree-item-subtree"
+            ng-show="toggle.isActive()"
+            ng-if="model.composition !== undefined"
+            >
 
             <mct-representation key="'subtree'"
                                 ng-model="ngModel"