diff --git a/vitrage_dashboard/dashboard/static/dashboard/project/components/template/templateContainer.html b/vitrage_dashboard/dashboard/static/dashboard/project/components/template/templateContainer.html
index 1aa79c2..986a615 100644
--- a/vitrage_dashboard/dashboard/static/dashboard/project/components/template/templateContainer.html
+++ b/vitrage_dashboard/dashboard/static/dashboard/project/components/template/templateContainer.html
@@ -10,7 +10,7 @@
         <span id="template_name">{$ data.metadata.name $}</span>
     </h2>
     <div ng-hide="yaml_view">
-        <div class="definition-block">
+        <div class="definition-block" ng-if="data.definitions && data.definitions.entities">
             <h3>Entities</h3>
             <div ng-repeat="entity in data.definitions.entities | orderBy: 'entity.category' track by entity.entity.template_id">
                 <details>
@@ -26,7 +26,7 @@
             </div>
             <br>
         </div>
-        <div class="definition-block">
+        <div class="definition-block" ng-if="data.definitions && data.definitions.relationships">
             <h3>Relationships</h3>
             <div ng-repeat="rel in data.definitions.relationships track by rel.relationship.template_id">
                 <details>
@@ -42,19 +42,44 @@
             </div>
             <br>
         </div>
-        <div class="definition-block">
-        <h3>Scenarios</h3>
+
+
+        <div class="definition-block" ng-if="data.equivalences">
+            <h3>Equivalences</h3>
+            <ul>
+                <li ng-repeat="equs in data.equivalences track by $index">
+                    <h4>Equivalence</h4>
+                    <div ng-repeat="equ in equs.equivalence">
+                        <details>
+                            <summary>{$ equ.entity.name $}</summary>
+                            <div class="tabbed">
+                                <ul>
+                                    <li ng-repeat="(property, value) in equ.entity">
+                                        <b>{$ property $}:</b> {$ value $}
+                                    </li>
+                                </ul>
+                            </div>
+                        </details>
+                    </div>
+                </div>
+            </ul>
+            <br>
+        </div>
+
+
+        <div class="definition-block" ng-if="data.scenarios">
+            <h3>Scenarios</h3>
             <div ng-repeat="scenario in data.scenarios track by $index">
                 <details>
                     <summary>{$ scenario.scenario.condition $}</summary>
                     <div class="tabbed">
                         <b>Actions:</b>
                         <ol>
-                            <div  ng-repeat="action in scenario.scenario.actions track by $index">
+                            <div ng-repeat="action in scenario.scenario.actions track by $index">
                                 <li>
                                     <ul>
                                         <li><b>action:</b> {$ action.action.action_type $}</li>
-                                        <li  ng-repeat="(key, value) in action.action.action_target track by $index">
+                                        <li ng-repeat="(key, value) in action.action.action_target track by $index">
                                             <b>{$ key $}:</b> {$ value $}
                                         </li>
                                         <li ng-repeat="(property, value) in action.action.properties track by $index">
@@ -67,8 +92,8 @@
                     </div>
                 </details>
             </div>
-        <br>
-    </div>
+            <br>
+        </div>
     </div>
     <div ng-show="yaml_view" class="definition-block">
         <pre contentEditable="false">
diff --git a/vitrage_dashboard/dashboard/static/dashboard/project/templateList/templateList.html b/vitrage_dashboard/dashboard/static/dashboard/project/templateList/templateList.html
index bddedc1..051abe6 100644
--- a/vitrage_dashboard/dashboard/static/dashboard/project/templateList/templateList.html
+++ b/vitrage_dashboard/dashboard/static/dashboard/project/templateList/templateList.html
@@ -1,11 +1,13 @@
 <div class="template-list" ng-controller="TemplateListController as templateList">
-    <div class="panel panel-default" >
+    <div class="panel panel-default">
 
-        <table st-table='templateList.itemplates' st-safe-src="templateList.templates" class="table-striped table-rsp table-detail modern" hz-table>
+        <table st-table='templateList.itemplates' st-safe-src="templateList.templates" class="table-striped table-rsp table-detail modern"
+               hz-table>
             <thead>
             <tr>
                 <th st-sort="name" style="padding-left: 15px;">{$ 'Name' | translate $}</th>
                 <th st-sort="status">{$ 'Status' | translate $}</th>
+                <th st-sort="type">{$ 'Type' | translate $}</th>
                 <th st-sort="details">{$ 'Details' | translate $}</th>
                 <th st-sort="timestamp">{$ 'Timestamp' | translate $}</th>
                 <th>{$ 'Show' | translate $}</th>
@@ -22,8 +24,9 @@
             <tr ng-repeat="template in templateList.itemplates track by $index">
                 <td style="padding-left: 15px;">{$template.name$}</td>
                 <td>{$template.status$}</td>
+                <td>{$template.type$}</td>
                 <td>{$template["status details"]$}</td>
-                <td><i class="fa fa-clock-o"></i> {$template.date | date:"yyyy-MM-dd hh:mm:ss"$} </td>
+                <td><i class="fa fa-clock-o"></i> {$template.date | date:"yyyy-MM-dd hh:mm:ss"$}</td>
                 <td ng-click="templateList.onShowClick(template)"><i class="fa fa-list"></i></td>
             </tr>
             </tbody>