diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/003-Relationships.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/003-Relationships.yaml
index 81a4d06..55f896b 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/003-Relationships.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/003-Relationships.yaml
@@ -249,6 +249,9 @@
 
   - IDR_Element__has__Element_Content: "{c1d32481-02f9-48c6-baf8-37d93fa8da23}"
   - IDR_Element_Content__for__Element: "{2eff7f58-0edd-40b7-9c06-00774257649e}"
+    
+  - IDR_Element__has_default__Display_Option: '{2ffeb5be-98fe-4008-a4d3-fd5b31ad320a}'
+  - IDR_Display_Option__default_for__Element: '{d5c777e7-d9d6-45c8-897c-905a3cbe736a}'
 
   - IDR_Element__has_label__Translation: "{7147ea90-9f45-4bb9-b151-025b6e2bd834}"
 
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/007-TaskClasses.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/007-TaskClasses.yaml
index 27d2b53..1c5aec0 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/007-TaskClasses.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/007-TaskClasses.yaml
@@ -1,6 +1,4 @@
 - entityDefinitions:
-  - IDI_Task_ViewClass: '{cd9366be-08d7-4b32-8963-3c42753fa8d9}'
-  - IDI_Task_EditClass: '{a0eb7af0-45f4-40fb-beb3-3fe3c48e2ffd}'
   #- IDC_SequenceTask: "{74c26737-000e-4bda-a1af-ad6d59bcc4b2}"
   #- IDC_ConvenienceTask: "{8a9fb632-6d04-49ff-8271-1f41dce1f254}"
   - IDI_SequenceTask_TestMethodBinding: '{3e55af17-00a9-418d-ae6f-7e52ec11148e}'
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00006-Element.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00006-Element.yaml
index ae456d9..e4b3c8a 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00006-Element.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00006-Element.yaml
@@ -26,6 +26,8 @@
       customTagName: 'processedByPRUMethod'
     - instance: '&IDR_Element__has__Layout;'
       customTagName: 'layout'
+    - instance: '&IDR_Element__has_default__Display_Option;'
+      customTagName: 'defaultDisplayOptions'
 
   - relationship: '&IDR_Process_Related_Updates_Method__processes__Element;'
     index: 97
@@ -74,4 +76,19 @@
     destinationClassId: '&IDC_Element;'
     siblingRelationshipId: '&IDR_Element__has__Element_Content;'
     singular: no
-    
\ No newline at end of file
+    
+  - relationship: '&IDR_Element__has_default__Display_Option;'
+    index: 379
+    sourceClassId: '&IDC_Element;'
+    type: 'has default'
+    destinationClassId: '&IDC_DisplayOption;'
+    siblingRelationshipId: '&IDR_Display_Option__default_for__Element;'
+    singular: no
+
+  - relationship: '&IDR_Display_Option__default_for__Element;'
+    index: 380
+    sourceClassId: '&IDC_DisplayOption;'
+    type: 'default for'
+    destinationClassId: '&IDC_Element;'
+    siblingRelationshipId: '&IDR_Element__has_default__Display_Option;'
+    singular: no
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPage.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPage.yaml
index 87b522a..6550467 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPage.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPage.yaml
@@ -11,6 +11,9 @@
   - element: '&IDE_LoginPage;'
     name: login page
     label: Log In
+    defaultDisplayOptions:
+    - instance: '&IDI_DisplayOption_DoNotShowLabel;'
+      
     elementContents:
     - globalIdentifier: '{13997179-656c-4034-b12f-046a7925bc3b}'
       defaultDataType: '&IDI_File_SignonLogo;'
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/Class/ViewClass.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/Class/ViewClass.yaml
index 222cc61..d4957b1 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/Class/ViewClass.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/Class/ViewClass.yaml
@@ -1,4 +1,7 @@
 - entityDefinitions:
+  - IDI_Task_ViewClass: '{cd9366be-08d7-4b32-8963-3c42753fa8d9}'
+  - IDI_Task_EditClass: '{a0eb7af0-45f4-40fb-beb3-3fe3c48e2ffd}'
+  
   - IDE_ClassStart: '{8730d21a-44a8-4d93-9bf7-f8191ca08489}'
   - IDE_ClassSelect: '{bc393547-3a92-48b2-b0dc-7e93306ab5fb}'
   - IDE_ViewClassButtons: '{a3fd6203-8e9c-4b7f-b731-e73f9f77967e}'
@@ -15,7 +18,7 @@
 
   - sequenceTask: '&IDI_Task_ViewClass;'
     name: 'View Class'
-    initiatingElement: '&IDE_ViewClass;'
+    initiatingElement: '&IDE_ClassSelect;'
     taskCategory: '&IDI_TaskCategory_Class;'
     
   - sequenceTask: '&IDI_Task_EditClass;'