diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 291112f15f0894f9b63424f10727970367bf5848..230a5381098c600a857e96d519b31834c67a5536 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -194,6 +194,7 @@
     </entityProvider>
     <entityField>
       <name>FULL_ATTRIBUTE_NAME</name>
+      <state>READONLY</state>
       <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/full_attribute_name/valueProcess.js</valueProcess>
     </entityField>
     <entityParameter>
@@ -227,6 +228,17 @@
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
+    <entityField>
+      <name>USAGELIST</name>
+      <title>Usages</title>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/usagelist/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>NAME_WITH_TYPE</name>
+      <title>Name</title>
+      <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/name_with_type/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Attribute_entity/entityfields/name_with_type/valueProcess.js b/entity/Attribute_entity/entityfields/name_with_type/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d14e07a8442ddff79c9c39b211cd7bd25024f153
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/name_with_type/valueProcess.js
@@ -0,0 +1,12 @@
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+import("Keyword_lib");
+import("KeywordRegistry_basic")
+
+var name = vars.get("$field.ATTRIBUTE_NAME");
+var type = vars.get("$field.ATTRIBUTE_TYPE");
+if (type.trim() != $AttributeTypes.COMBOVALUE)
+    name += " (" + translate.text("Type") + ": " + KeywordUtils.getViewValue($KeywordRegistry.attributeType(), type) + ")";
+result.string(name);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/usagelist/valueProcess.js b/entity/Attribute_entity/entityfields/usagelist/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0192da48ac5fb006f40737067207ddf9043604a0
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/usagelist/valueProcess.js
@@ -0,0 +1,12 @@
+import("system.translate");
+import("system.result");
+import("system.db");
+import("system.vars");
+import("Sql_lib");
+
+var usages = db.array(db.COLUMN, SqlCondition.begin()
+    .andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", vars.get("$field.AB_ATTRIBUTEID"))
+    .buildSql("select OBJECT_TYPE from AB_ATTRIBUTEUSAGE"));
+var usageStr = translate.text("Usage");
+
+result.string(usages.length ? usageStr + ": " + usages.join(", ") : "\u00A0"); // \u00A0 -> space character that doesn't get trimmed 
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index fc4bfc460579bca07e6435f1d10b2a124009c883..82c7f229e6be69374bc8ee45bbe2e192c487779b 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2448,6 +2448,9 @@
     <entry>
       <key>Object tree</key>
     </entry>
+    <entry>
+      <key>New Appointment</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 08bb5c285ada13d5e2b5b3602c3488bafc9de014..fe72a0aaa5effdc9033285b8c192d255795ab122 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2472,6 +2472,9 @@
     <entry>
       <key>Object tree</key>
     </entry>
+    <entry>
+      <key>New Appointment</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/neonView/AttributeFilter_view/AttributeFilter_view.aod b/neonView/AttributeFilter_view/AttributeFilter_view.aod
index a5e0dc9ccb2d217897e89db3666da7719245559f..823ebd3b351eb052a322ae8ae86c7d1960fd127b 100644
--- a/neonView/AttributeFilter_view/AttributeFilter_view.aod
+++ b/neonView/AttributeFilter_view/AttributeFilter_view.aod
@@ -14,8 +14,8 @@
       <name>AttributesTreetable</name>
       <parentField>ATTRIBUTE_PARENT_ID</parentField>
       <favoriteActionGroup1>AttributeActions</favoriteActionGroup1>
-      <titleField>ATTRIBUTE_NAME</titleField>
-      <descriptionField>ATTRIBUTE_TYPE</descriptionField>
+      <titleField>NAME_WITH_TYPE</titleField>
+      <descriptionField>USAGELIST</descriptionField>
       <entityField>#ENTITY</entityField>
     </treetableViewTemplate>
     <tableViewTemplate>
diff --git a/neonView/AttributePreview_view/AttributePreview_view.aod b/neonView/AttributePreview_view/AttributePreview_view.aod
index d7a389b7df874d6f5daa3b22aa172a7c4fc9a0c5..c96aad0cda7eca0e8701a260bb23d72a4b19c587 100644
--- a/neonView/AttributePreview_view/AttributePreview_view.aod
+++ b/neonView/AttributePreview_view/AttributePreview_view.aod
@@ -14,8 +14,21 @@
       <subtitleField>ATTRIBUTE_TYPE</subtitleField>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
+    <genericViewTemplate>
+      <name>Details</name>
+      <showDrawer v="true" />
+      <drawerCaption>Details</drawerCaption>
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>70953962-9472-484b-ac95-567d2249f42e</name>
+          <entityField>ATTRIBUTE_ACTIVE</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
     <genericViewTemplate>
       <name>Info</name>
+      <editMode v="false" />
       <showDrawer v="true" />
       <entityField>#ENTITY</entityField>
       <title></title>
@@ -28,10 +41,6 @@
           <name>7e64cd02-e91e-4845-bc77-256a4945670e</name>
           <entityField>KEYWORD_CONTAINER</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>e00bfeb1-7003-4d5a-b71a-c6921e255c9d</name>
-          <entityField>ATTRIBUTE_ACTIVE</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>00a51564-0eca-43f9-8235-b811df1dbafd</name>
           <entityField>ATTRIBUTE_LEVEL</entityField>