diff --git a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/AddFullyQualifiedNameController.java b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/AddFullyQualifiedNameController.java
index a2b35f6e0..2f0e548e8 100644
--- a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/AddFullyQualifiedNameController.java
+++ b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/AddFullyQualifiedNameController.java
@@ -55,16 +55,19 @@ public class AddFullyQualifiedNameController extends AbstractBasicController {
     private Label addFqnTitleLabel;
 
     @FXML
-    private ComboBox<EntityFacade> moduleComboBox;
+    private TextField fullyQualifiedNameTextField;
 
     @FXML
-    private TextField fullyQualifiedNameTextField;
+    private ComboBox<ConceptEntity> typeDisplayComboBox;
+
+    @FXML
+    private ComboBox<EntityFacade> caseSignificanceComboBox;
 
     @FXML
     private ComboBox<EntityFacade> statusComboBox;
 
     @FXML
-    private ComboBox<EntityFacade> caseSignificanceComboBox;
+    private ComboBox<EntityFacade> moduleComboBox;
 
     @FXML
     private ComboBox<EntityFacade> languageComboBox;
@@ -253,7 +256,7 @@ private void saveFullQualifiedName(ActionEvent actionEvent) {
     }
 
     @FXML
-    public void cancel() {
+    public void handleCancelButtonEvent() {
         close();
     }
 
diff --git a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/AddOtherNameController.java b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/AddOtherNameController.java
index ef7008e35..d80d2f7f6 100644
--- a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/AddOtherNameController.java
+++ b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/AddOtherNameController.java
@@ -56,16 +56,19 @@ public class AddOtherNameController extends AbstractBasicController {
     private Label addOtherNameTitleLabel;
 
     @FXML
-    private ComboBox<EntityFacade> moduleComboBox;
+    private TextField otherNameTextField;
 
     @FXML
-    private TextField otherNameTextField;
+    private ComboBox<EntityFacade> typeDisplayComboBox;
+
+    @FXML
+    private ComboBox<EntityFacade> caseSignificanceComboBox;
 
     @FXML
     private ComboBox<EntityFacade> statusComboBox;
 
     @FXML
-    private ComboBox<EntityFacade> caseSignificanceComboBox;
+    private ComboBox<EntityFacade> moduleComboBox;
 
     @FXML
     private ComboBox<EntityFacade> languageComboBox;
@@ -263,7 +266,7 @@ public void clearView() {
     }
 
     @FXML
-    public void cancel() {
+    public void handleCancelButtonEvent() {
         close();
     }
 
diff --git a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditDescriptionFormController.java b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditDescriptionFormController.java
index f2d08ff25..3f23286d0 100644
--- a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditDescriptionFormController.java
+++ b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditDescriptionFormController.java
@@ -88,16 +88,16 @@ public class EditDescriptionFormController implements BasicController {
     private TextField otherNameTextField;
 
     @FXML
-    private ComboBox<ConceptEntity> comboBox;
+    private ComboBox<ConceptEntity> typeDisplayComboBox;
 
     @FXML
-    private ComboBox<ConceptEntity> moduleComboBox;
+    private ComboBox<ConceptEntity> caseSignificanceComboBox;
 
     @FXML
     private ComboBox<ConceptEntity> statusComboBox;
 
     @FXML
-    private ComboBox<ConceptEntity> caseSignificanceComboBox;
+    private ComboBox<ConceptEntity> moduleComboBox;
 
     @FXML
     private ComboBox<ConceptEntity> languageComboBox;
@@ -106,13 +106,13 @@ public class EditDescriptionFormController implements BasicController {
     private Label editDescriptionTitleLabel;
 
     @FXML
-    private Label dialect1;
+    private Label dialect1Label;
 
     @FXML
-    private Label dialect2;
+    private Label dialect2Label;
 
     @FXML
-    private Label dialect3;
+    private Label dialect3Label;
 
     @FXML
     private ComboBox dialectComboBox1;
diff --git a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditFullyQualifiedNameController.java b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditFullyQualifiedNameController.java
index eecffb98f..052bbf031 100644
--- a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditFullyQualifiedNameController.java
+++ b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditFullyQualifiedNameController.java
@@ -68,6 +68,9 @@ public class EditFullyQualifiedNameController implements BasicController {
     @FXML
     private TextField fqnText;
 
+    @FXML
+    private ComboBox<ConceptEntity> typeDisplayComboBox;
+
     @FXML
     private ComboBox<ConceptEntity> moduleComboBox;
 
@@ -81,13 +84,13 @@ public class EditFullyQualifiedNameController implements BasicController {
     private ComboBox<ConceptEntity> languageComboBox;
 
     @FXML
-    private Label dialect1;
+    private Label dialect1Label;
 
     @FXML
-    private Label dialect2;
+    private Label dialect2Label;
 
     @FXML
-    private Label dialect3;
+    private Label dialect3Label;
 
     @FXML
     private ComboBox dialectComboBox1;
diff --git a/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/add-fully-qualified-name.fxml b/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/add-fully-qualified-name.fxml
index 1d08f6fc5..c7a8e7758 100644
--- a/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/add-fully-qualified-name.fxml
+++ b/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/add-fully-qualified-name.fxml
@@ -14,102 +14,117 @@
 <?import javafx.scene.layout.VBox?>
 <?import dev.ikm.komet.kview.controls.SortedComboBox?>
 
-<BorderPane minHeight="100.0" minWidth="100.0" prefWidth="487.0" stylesheets="@../kview.css" xmlns="http://javafx.com/javafx/23" xmlns:fx="http://javafx.com/fxml/1">
-   <top>
-      <HBox alignment="TOP_CENTER" prefHeight="0.0" prefWidth="0.0" styleClass="edit-concept-label-container" BorderPane.alignment="TOP_CENTER">
-         <children>
-            <Label fx:id="addFqnTitleLabel" alignment="TOP_CENTER" styleClass="edit-concept-title" text="Add Description: Fully Qualified Name" textAlignment="CENTER" />
-         </children>
-      </HBox>
-   </top>
-   <bottom>
-      <VBox alignment="TOP_CENTER" BorderPane.alignment="CENTER">
-         <children>
-            <HBox alignment="BOTTOM_RIGHT" styleClass="add-description-bottom-label">
-               <children>
-                  <Label text="Purpose of this semantic is to help define this concept." />
-               </children>
-            </HBox>
-            <HBox alignment="BOTTOM_RIGHT" layoutX="10.0" layoutY="110.0" prefHeight="50.0" prefWidth="200.0">
-               <children>
-                  <ButtonBar prefHeight="75.0" prefWidth="200.0">
-                     <buttons>
-                        <Button mnemonicParsing="false" onAction="#cancel" styleClass="edit-concept-cancel-button" text="CANCEL" />
-                        <Button fx:id="submitButton" layoutX="135.0" layoutY="47.0" minWidth="63.0" mnemonicParsing="false" onAction="#saveFullQualifiedName" styleClass="edit-concept-submit-button" text="SUBMIT" />
-                     </buttons>
-                  </ButtonBar>
-               </children>
-               <opaqueInsets>
-                  <Insets />
-               </opaqueInsets>
-               <VBox.margin>
-                  <Insets right="20.0" />
-               </VBox.margin>
-            </HBox>
-         </children>
-      </VBox>
-   </bottom>
-   <center>
-      <GridPane prefWidth="487.0" BorderPane.alignment="CENTER">
-         <columnConstraints>
-            <ColumnConstraints hgrow="SOMETIMES" maxWidth="100.0" minWidth="100.0" prefWidth="100.0" />
-            <ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" prefWidth="400.0" />
-         </columnConstraints>
-         <rowConstraints>
-            <RowConstraints maxHeight="40.0" minHeight="10.0" prefHeight="40.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="1.7976931348623157E308" vgrow="NEVER" />
-            <RowConstraints vgrow="SOMETIMES" />
-         </rowConstraints>
-         <children>
-            <Label styleClass="add-description-label" text="Name" />
-            <Label styleClass="add-description-label" text="Type" GridPane.rowIndex="1" />
-            <Label prefWidth="100.0" styleClass="add-description-label" text="Case Significance" wrapText="true" GridPane.rowIndex="2" />
-            <Label styleClass="add-description-label" text="Language" GridPane.rowIndex="5" />
-            <Label styleClass="add-description-label" text="Status" GridPane.rowIndex="3" />
-            <Label styleClass="add-description-label" text="Module" GridPane.rowIndex="4" />
-            <TextField styleClass="komet-text-field" fx:id="fullyQualifiedNameTextField" prefHeight="25.0" promptText="Enter Name" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS">
-               <GridPane.margin>
-                  <Insets right="15.0" />
-               </GridPane.margin>
-            </TextField>
-            <SortedComboBox styleClass="blue-arrow-combo-box" disable="true" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Fully Qualified Name" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1">
-               <GridPane.margin>
-                  <Insets right="15.0" />
-               </GridPane.margin>
-            </SortedComboBox>
-            <SortedComboBox fx:id="caseSignificanceComboBox"  styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select case sensitivity" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2">
-               <GridPane.margin>
-                  <Insets right="15.0" />
-               </GridPane.margin>
-            </SortedComboBox>
-            <SortedComboBox fx:id="languageComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Language" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="5">
-               <GridPane.margin>
-                  <Insets right="15.0" />
-               </GridPane.margin>
-            </SortedComboBox>
-            <SortedComboBox fx:id="statusComboBox"  styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Status" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3">
-               <GridPane.margin>
-                  <Insets right="15.0" />
-               </GridPane.margin>
-            </SortedComboBox>
-            <SortedComboBox fx:id="moduleComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Module" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="4">
-               <GridPane.margin>
-                  <Insets right="15.0" />
-               </GridPane.margin>
-            </SortedComboBox>
-            <TextArea styleClass="komet-text-area" maxHeight="80.0" maxWidth="1.7976931348623157E308" text="Add comment here..." GridPane.columnSpan="2" GridPane.rowIndex="7">
-               <GridPane.margin>
-                  <Insets left="15.0" right="15.0" />
-               </GridPane.margin>
-            </TextArea>
-            <Label styleClass="add-description-label" text="Comments" GridPane.rowIndex="6" />
-         </children>
-      </GridPane>
-   </center>
-</BorderPane>
+<BorderPane minWidth="100.0" prefWidth="487.0" stylesheets="@../kview.css" xmlns="http://javafx.com/javafx/23" xmlns:fx="http://javafx.com/fxml/1">
+    <top>
+        <HBox alignment="TOP_CENTER" minHeight="40.0" prefHeight="40.0" prefWidth="0.0" styleClass="edit-concept-label-container" BorderPane.alignment="TOP_CENTER">
+            <children>
+                <Label fx:id="addFqnTitleLabel" alignment="TOP_CENTER" styleClass="edit-concept-title" text="Add Description: Fully Qualified Name" textAlignment="CENTER" />
+            </children>
+        </HBox>
+    </top>
+    <bottom>
+        <VBox alignment="TOP_CENTER" BorderPane.alignment="CENTER" minHeight="80.0" prefHeight="80.0">
+            <children>
+                <HBox alignment="BOTTOM_RIGHT" styleClass="add-description-bottom-label">
+                    <children>
+                        <Label text="Purpose of this semantic is to help define this concept." />
+                    </children>
+                </HBox>
+                <HBox alignment="BOTTOM_RIGHT" layoutX="10.0" layoutY="110.0" prefHeight="50.0" prefWidth="200.0">
+                    <children>
+                        <ButtonBar prefHeight="75.0" prefWidth="200.0">
+                            <buttons>
+                                <Button fx:id="cancelButton" mnemonicParsing="false" onAction="#handleCancelButtonEvent" styleClass="edit-concept-cancel-button" text="CANCEL" />
+                                <Button fx:id="submitButton" layoutX="135.0" layoutY="47.0" minWidth="63.0" mnemonicParsing="false" onAction="#saveFullQualifiedName" styleClass="edit-concept-submit-button" text="SUBMIT" />
+                            </buttons>
+                        </ButtonBar>
+                    </children>
+                    <opaqueInsets>
+                        <Insets />
+                    </opaqueInsets>
+                    <VBox.margin>
+                        <Insets right="20.0" />
+                    </VBox.margin>
+                </HBox>
+            </children>
+        </VBox>
+    </bottom>
+    <center>
+        <GridPane prefWidth="487.0" BorderPane.alignment="CENTER">
+            <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="100.0" minWidth="100.0" prefWidth="100.0" />
+                <ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" prefWidth="400.0" />
+            </columnConstraints>
+            <rowConstraints>
+                <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+                <!-- Comments label  -->
+                <RowConstraints fx:id="dialectCommentsRowConstraints"  minHeight="40.0" prefHeight="40.0" maxHeight="40.0" vgrow="SOMETIMES" />
+                <!-- Comments section -->
+                <RowConstraints vgrow="SOMETIMES" minHeight="80.0"/>
+            </rowConstraints>
+            <children>
+                <Label styleClass="add-description-label" text="Name" GridPane.rowIndex="0"  />
+                <Label styleClass="add-description-label" text="Type" GridPane.rowIndex="1" />
+                <Label prefWidth="100.0" styleClass="add-description-label" text="Case Significance" wrapText="true" GridPane.rowIndex="2" />
+                <Label styleClass="add-description-label" text="Status" GridPane.rowIndex="3" />
+                <Label styleClass="add-description-label" text="Module" GridPane.rowIndex="4" />
+                <Label styleClass="add-description-label" text="Language" GridPane.rowIndex="5" />
+                <Label fx:id="commentsLabel" styleClass="add-description-label" text="Comments" GridPane.rowIndex="6" />
+
+                <!-- Name field -->
+                <TextField fx:id="fullyQualifiedNameTextField" styleClass="komet-text-field" prefHeight="25.0" promptText="Enter Name" GridPane.columnIndex="1" GridPane.rowIndex="0" GridPane.hgrow="ALWAYS">
+                    <GridPane.margin>
+                        <Insets right="15.0" />
+                    </GridPane.margin>
+                </TextField>
+
+                <!-- Type display (disabled combo box used as label) -->
+                <SortedComboBox fx:id="typeDisplayComboBox" styleClass="blue-arrow-combo-box" disable="true" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Type" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1">
+                    <GridPane.margin>
+                        <Insets right="15.0" />
+                    </GridPane.margin>
+                </SortedComboBox>
+
+                <!-- Case Significance -->
+                <SortedComboBox fx:id="caseSignificanceComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select case sensitivity" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2">
+                    <GridPane.margin>
+                        <Insets right="15.0" />
+                    </GridPane.margin>
+                </SortedComboBox>
+
+                <!-- Status -->
+                <SortedComboBox fx:id="statusComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Status" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3">
+                    <GridPane.margin>
+                        <Insets right="15.0" />
+                    </GridPane.margin>
+                </SortedComboBox>
+
+                <!-- Module -->
+                <SortedComboBox fx:id="moduleComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Module" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="4">
+                    <GridPane.margin>
+                        <Insets right="15.0" />
+                    </GridPane.margin>
+                </SortedComboBox>
+
+                <!-- Language -->
+                <SortedComboBox fx:id="languageComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Language" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="5">
+                    <GridPane.margin>
+                        <Insets right="15.0" />
+                    </GridPane.margin>
+                </SortedComboBox>
+
+                <!-- Comments -->
+                <TextArea fx:id="commentsTextArea" styleClass="komet-text-area" maxHeight="80.0" maxWidth="1.7976931348623157E308" text="Add comment here..." GridPane.columnSpan="2" GridPane.rowIndex="7" GridPane.valignment="TOP">
+                    <GridPane.margin>
+                        <Insets left="15.0" right="15.0" />
+                    </GridPane.margin>
+                </TextArea>
+            </children>
+        </GridPane>
+    </center>
+</BorderPane>
\ No newline at end of file
diff --git a/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/add-other-name.fxml b/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/add-other-name.fxml
index d33897a0d..28a31be62 100644
--- a/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/add-other-name.fxml
+++ b/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/add-other-name.fxml
@@ -14,16 +14,16 @@
 <?import javafx.scene.layout.VBox?>
 <?import dev.ikm.komet.kview.controls.SortedComboBox?>
 
-<BorderPane minHeight="100.0" minWidth="100.0" prefWidth="487.0" stylesheets="@../kview.css" xmlns="http://javafx.com/javafx/23" xmlns:fx="http://javafx.com/fxml/1">
+<BorderPane minWidth="100.0" prefWidth="487.0" stylesheets="@../kview.css" xmlns="http://javafx.com/javafx/23" xmlns:fx="http://javafx.com/fxml/1">
     <top>
-        <HBox alignment="TOP_CENTER" prefHeight="0.0" prefWidth="0.0" styleClass="edit-concept-label-container" BorderPane.alignment="TOP_CENTER">
+        <HBox alignment="TOP_CENTER" minHeight="40.0" prefHeight="40.0" prefWidth="0.0" styleClass="edit-concept-label-container" BorderPane.alignment="TOP_CENTER">
             <children>
                 <Label fx:id="addOtherNameTitleLabel" alignment="TOP_CENTER" styleClass="edit-concept-title" text="Add New Description: Other Name" textAlignment="CENTER" />
             </children>
         </HBox>
     </top>
     <bottom>
-        <VBox alignment="TOP_CENTER" BorderPane.alignment="CENTER">
+        <VBox alignment="TOP_CENTER" BorderPane.alignment="CENTER" minHeight="80.0" prefHeight="80.0">
             <children>
                 <HBox alignment="BOTTOM_RIGHT" styleClass="add-description-bottom-label">
                     <children>
@@ -34,7 +34,7 @@
                     <children>
                         <ButtonBar prefHeight="75.0" prefWidth="200.0">
                             <buttons>
-                                <Button mnemonicParsing="false" onAction="#cancel" styleClass="edit-concept-cancel-button" text="CANCEL" />
+                                <Button fx:id="cancelButton" mnemonicParsing="false" onAction="#handleCancelButtonEvent" styleClass="edit-concept-cancel-button" text="CANCEL" />
                                 <Button fx:id="submitButton" layoutX="135.0" layoutY="47.0" minWidth="63.0" mnemonicParsing="false" onAction="#saveOtherName" styleClass="edit-concept-submit-button" text="SUBMIT" />
                             </buttons>
                         </ButtonBar>
@@ -49,61 +49,82 @@
             </children>
         </VBox>
     </bottom>
-   <center>
-      <GridPane prefWidth="487.0" BorderPane.alignment="CENTER">
-        <columnConstraints>
-          <ColumnConstraints hgrow="SOMETIMES" maxWidth="100.0" minWidth="100.0" prefWidth="100.0" />
-          <ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" prefWidth="400.0" />
-        </columnConstraints>
-        <rowConstraints>
-          <RowConstraints maxHeight="40.0" minHeight="10.0" prefHeight="40.0" vgrow="SOMETIMES" />
-          <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
-          <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="1.7976931348623157E308" vgrow="NEVER" />
-            <RowConstraints vgrow="SOMETIMES" />
-        </rowConstraints>
-         <children>
-            <Label styleClass="add-description-label" text="Name" />
-            <Label styleClass="add-description-label" text="Type" GridPane.rowIndex="1" />
-            <Label prefWidth="100.0" styleClass="add-description-label" text="Case Significance" wrapText="true" GridPane.rowIndex="2" />
-            <Label styleClass="add-description-label" text="Language" GridPane.rowIndex="5" />
-            <Label styleClass="add-description-label" text="Status" GridPane.rowIndex="3" />
-            <Label styleClass="add-description-label" text="Module" GridPane.rowIndex="4" />
-            <TextField styleClass="komet-text-field" fx:id="otherNameTextField" prefHeight="25.0" promptText="Enter Name" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS">
-               <GridPane.margin>
-                  <Insets right="15.0" />
-               </GridPane.margin></TextField>
-            <SortedComboBox styleClass="blue-arrow-combo-box" disable="true" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Other Name" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1">
-               <GridPane.margin>
-                  <Insets right="15.0" />
-               </GridPane.margin></SortedComboBox>
-            <SortedComboBox fx:id="caseSignificanceComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select case sensitivity" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2">
-               <GridPane.margin>
-                  <Insets right="15.0" />
-               </GridPane.margin></SortedComboBox>
-            <SortedComboBox fx:id="languageComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Language" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="5">
-               <GridPane.margin>
-                  <Insets right="15.0" />
-               </GridPane.margin></SortedComboBox>
-            <SortedComboBox fx:id="statusComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Status" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3">
-               <GridPane.margin>
-                  <Insets right="15.0" />
-               </GridPane.margin></SortedComboBox>
-            <SortedComboBox fx:id="moduleComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Module" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="4">
-               <GridPane.margin>
-                  <Insets right="15.0" />
-               </GridPane.margin></SortedComboBox>
-                <TextArea styleClass="komet-text-area" maxHeight="80.0" maxWidth="1.7976931348623157E308" text="Add comment here..." GridPane.columnSpan="2" GridPane.rowIndex="7">
-               <GridPane.margin>
-                  <Insets left="15.0" right="15.0" />
-               </GridPane.margin>
-            </TextArea>
-            <Label styleClass="add-description-label" text="Comments" GridPane.rowIndex="6" />
-         </children>
-      </GridPane>
-   </center>
-</BorderPane>
+    <center>
+        <GridPane prefWidth="487.0" BorderPane.alignment="CENTER">
+            <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="100.0" minWidth="100.0" prefWidth="100.0" />
+                <ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" prefWidth="400.0" />
+            </columnConstraints>
+            <rowConstraints>
+                <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+                <!-- Comments label  -->
+                <RowConstraints fx:id="dialectCommentsRowConstraints"  minHeight="40.0" prefHeight="40.0" maxHeight="40.0" vgrow="SOMETIMES" />
+                <!-- Comments section -->
+                <RowConstraints vgrow="SOMETIMES" minHeight="80.0"/>
+            </rowConstraints>
+            <children>
+                <Label styleClass="add-description-label" text="Name" GridPane.rowIndex="0"  />
+                <Label styleClass="add-description-label" text="Type" GridPane.rowIndex="1" />
+                <Label prefWidth="100.0" styleClass="add-description-label" text="Case Significance" wrapText="true" GridPane.rowIndex="2" />
+                <Label styleClass="add-description-label" text="Status" GridPane.rowIndex="3" />
+                <Label styleClass="add-description-label" text="Module" GridPane.rowIndex="4" />
+                <Label styleClass="add-description-label" text="Language" GridPane.rowIndex="5" />
+                <Label fx:id="commentsLabel" styleClass="add-description-label" text="Comments" GridPane.rowIndex="6" />
+
+                <!-- Name field -->
+                <TextField fx:id="otherNameTextField" styleClass="komet-text-field" prefHeight="25.0" promptText="Enter Name" GridPane.columnIndex="1" GridPane.rowIndex="0" GridPane.hgrow="ALWAYS">
+                    <GridPane.margin>
+                        <Insets right="15.0" />
+                    </GridPane.margin>
+                </TextField>
+
+                <!-- Type display (disabled combo box used as label) -->
+                <SortedComboBox fx:id="typeDisplayComboBox" styleClass="blue-arrow-combo-box" disable="true" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Type" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1">
+                    <GridPane.margin>
+                        <Insets right="15.0" />
+                    </GridPane.margin>
+                </SortedComboBox>
+
+                <!-- Case Significance -->
+                <SortedComboBox fx:id="caseSignificanceComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select case sensitivity" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2">
+                    <GridPane.margin>
+                        <Insets right="15.0" />
+                    </GridPane.margin>
+                </SortedComboBox>
+
+                <!-- Status -->
+                <SortedComboBox fx:id="statusComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Status" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3">
+                    <GridPane.margin>
+                        <Insets right="15.0" />
+                    </GridPane.margin>
+                </SortedComboBox>
+
+                <!-- Module -->
+                <SortedComboBox fx:id="moduleComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Module" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="4">
+                    <GridPane.margin>
+                        <Insets right="15.0" />
+                    </GridPane.margin>
+                </SortedComboBox>
+
+                <!-- Language -->
+                <SortedComboBox fx:id="languageComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Language" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="5">
+                    <GridPane.margin>
+                        <Insets right="15.0" />
+                    </GridPane.margin>
+                </SortedComboBox>
+
+                <!-- Comments -->
+                <TextArea fx:id="commentsTextArea" styleClass="komet-text-area" maxHeight="80.0" maxWidth="1.7976931348623157E308" text="Add comment here..." GridPane.columnSpan="2" GridPane.rowIndex="7" GridPane.valignment="TOP">
+                    <GridPane.margin>
+                        <Insets left="15.0" right="15.0" />
+                    </GridPane.margin>
+                </TextArea>
+            </children>
+        </GridPane>
+    </center>
+</BorderPane>
\ No newline at end of file
diff --git a/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/edit-fully-qualified-name.fxml b/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/edit-fully-qualified-name.fxml
index 277d65e45..80d557074 100644
--- a/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/edit-fully-qualified-name.fxml
+++ b/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/edit-fully-qualified-name.fxml
@@ -16,14 +16,14 @@
 
 <BorderPane minWidth="100.0" prefWidth="487.0" stylesheets="@../kview.css" xmlns="http://javafx.com/javafx/23" xmlns:fx="http://javafx.com/fxml/1">
     <top>
-        <HBox alignment="TOP_CENTER" styleClass="edit-concept-label-container" BorderPane.alignment="TOP_CENTER">
+        <HBox alignment="TOP_CENTER" minHeight="40.0" prefHeight="40.0" prefWidth="0.0" styleClass="edit-concept-label-container" BorderPane.alignment="TOP_CENTER">
             <children>
                 <Label fx:id="editFullyQualifiedNameTitleLabel" alignment="TOP_CENTER" styleClass="edit-concept-title" text="Edit Description: Fully Qualified Name" textAlignment="CENTER" />
             </children>
         </HBox>
     </top>
     <bottom>
-        <VBox alignment="BOTTOM_CENTER" prefWidth="100.0" BorderPane.alignment="CENTER">
+        <VBox alignment="TOP_CENTER" BorderPane.alignment="CENTER" minHeight="80.0" prefHeight="80.0">
             <children>
                 <HBox alignment="BOTTOM_RIGHT" styleClass="add-description-bottom-label">
                     <children>
@@ -47,16 +47,13 @@
                     </VBox.margin>
                 </HBox>
             </children>
-         <opaqueInsets>
-            <Insets top="30.0" />
-         </opaqueInsets>
         </VBox>
     </bottom>
     <center>
         <GridPane prefWidth="487.0" BorderPane.alignment="CENTER">
             <columnConstraints>
                 <ColumnConstraints hgrow="SOMETIMES" maxWidth="100.0" minWidth="100.0" prefWidth="100.0" />
-                <ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" prefWidth="310.0" />
+                <ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" prefWidth="400.0" />
             </columnConstraints>
             <rowConstraints>
                 <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
@@ -65,61 +62,72 @@
                 <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
                 <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
                 <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
-                <RowConstraints maxHeight="1.7976931348623157E308" vgrow="ALWAYS" />
-                <RowConstraints vgrow="ALWAYS" />
-                <RowConstraints maxHeight="1.7976931348623157E308" vgrow="ALWAYS" />
+                <!-- Dialects section  -->
+                <RowConstraints fx:id="dialectCommentsRowConstraints"  minHeight="200.0" prefHeight="200.0" maxHeight="200.0" vgrow="SOMETIMES" />
+                <!-- Comments section -->
+                <RowConstraints vgrow="SOMETIMES" minHeight="80.0"/>
             </rowConstraints>
             <children>
-                <Label styleClass="add-description-label" text="Name" />
+                <Label styleClass="add-description-label" text="Name" GridPane.rowIndex="0"  />
                 <Label styleClass="add-description-label" text="Type" GridPane.rowIndex="1" />
                 <Label prefWidth="100.0" styleClass="add-description-label" text="Case Significance" wrapText="true" GridPane.rowIndex="2" />
-                <Label styleClass="add-description-label" text="Language" GridPane.rowIndex="5" />
                 <Label styleClass="add-description-label" text="Status" GridPane.rowIndex="3" />
                 <Label styleClass="add-description-label" text="Module" GridPane.rowIndex="4" />
-                <TextField fx:id="fqnText" prefHeight="25.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS">
+                <Label styleClass="add-description-label" text="Language" GridPane.rowIndex="5" />
+
+                <!-- Name field -->
+                <TextField fx:id="fqnText" styleClass="komet-text-field" prefHeight="25.0" promptText="Enter Name" GridPane.columnIndex="1" GridPane.rowIndex="0" GridPane.hgrow="ALWAYS">
                     <GridPane.margin>
                         <Insets right="15.0" />
-                    </GridPane.margin></TextField>
-                <SortedComboBox disable="true" maxWidth="1.7976931348623157E308" prefHeight="25.0" prefWidth="310.0" promptText="Fully Qualified Name" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1">
+                    </GridPane.margin>
+                </TextField>
+
+                <!-- Type display (disabled combo box used as label) -->
+                <SortedComboBox fx:id="typeDisplayComboBox" styleClass="blue-arrow-combo-box" disable="true" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Type" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1">
                     <GridPane.margin>
                         <Insets right="15.0" />
                     </GridPane.margin>
                 </SortedComboBox>
-                <SortedComboBox fx:id="caseSignificanceComboBox" maxWidth="1.7976931348623157E308" prefHeight="25.0" prefWidth="310.0" promptText="Select" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2">
+
+                <!-- Case Significance -->
+                <SortedComboBox fx:id="caseSignificanceComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select case sensitivity" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2">
                     <GridPane.margin>
                         <Insets right="15.0" />
                     </GridPane.margin>
                 </SortedComboBox>
-                <SortedComboBox fx:id="languageComboBox" maxWidth="1.7976931348623157E308" prefHeight="25.0" prefWidth="310.0" promptText="Select" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="5">
+
+                <!-- Status -->
+                <SortedComboBox fx:id="statusComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Status" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3">
                     <GridPane.margin>
                         <Insets right="15.0" />
                     </GridPane.margin>
                 </SortedComboBox>
-                <SortedComboBox fx:id="statusComboBox" maxWidth="1.7976931348623157E308" prefHeight="25.0" prefWidth="310.0" promptText="Select" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3">
+
+                <!-- Module -->
+                <SortedComboBox fx:id="moduleComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Module" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="4">
                     <GridPane.margin>
                         <Insets right="15.0" />
                     </GridPane.margin>
                 </SortedComboBox>
-                <SortedComboBox fx:id="moduleComboBox" maxWidth="1.7976931348623157E308" prefHeight="25.0" prefWidth="310.0" promptText="Select" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="4">
+
+                <!-- Language -->
+                <SortedComboBox fx:id="languageComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Language" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="5">
                     <GridPane.margin>
                         <Insets right="15.0" />
                     </GridPane.margin>
                 </SortedComboBox>
-                <TextArea prefHeight="74.0" prefWidth="200.0" promptText="This is an accurate semantic" text="Add comments here....." GridPane.columnSpan="2" GridPane.rowIndex="8">
-                    <GridPane.margin>
-                        <Insets left="15.0" right="15.0" top="15.0" />
-                    </GridPane.margin>
-                </TextArea>
-                <VBox GridPane.columnSpan="2" GridPane.rowIndex="6">
+
+                <!-- Dialects section (hidden by default for add modes) -->
+                <VBox fx:id="dialectsContainer" GridPane.columnSpan="2" GridPane.rowIndex="6">
                     <children>
                         <HBox depthTest="ENABLE" styleClass="dialect-container">
                             <children>
-                                <Label fx:id="dialect1" prefHeight="24.0" prefWidth="280.0" styleClass="dialect-label" text="Dialect #1">
+                                <Label fx:id="dialect1Label" prefHeight="24.0" prefWidth="280.0" styleClass="dialect-label" text="Dialect #1">
                                     <opaqueInsets>
                                         <Insets />
                                     </opaqueInsets>
                                 </Label>
-                                <SortedComboBox fx:id="dialectComboBox1" disable="true" prefHeight="28.0" prefWidth="173.0">
+                                <SortedComboBox fx:id="dialectComboBox1" styleClass="blue-arrow-combo-box" disable="true" prefHeight="28.0" prefWidth="173.0">
                                     <HBox.margin>
                                         <Insets bottom="8.0" />
                                     </HBox.margin>
@@ -137,12 +145,12 @@
                         </HBox>
                         <HBox depthTest="ENABLE" layoutX="25.0" layoutY="10.0" styleClass="dialect-container">
                             <children>
-                                <Label fx:id="dialect2" prefHeight="24.0" prefWidth="280.0" styleClass="dialect-label" text="Dialect #2">
+                                <Label fx:id="dialect2Label" prefHeight="24.0" prefWidth="280.0" styleClass="dialect-label" text="Dialect #2">
                                     <opaqueInsets>
                                         <Insets />
                                     </opaqueInsets>
                                 </Label>
-                                <SortedComboBox fx:id="dialectComboBox2" disable="true" prefHeight="28.0" prefWidth="173.0">
+                                <SortedComboBox fx:id="dialectComboBox2" styleClass="blue-arrow-combo-box" disable="true" prefHeight="28.0" prefWidth="173.0">
                                     <HBox.margin>
                                         <Insets bottom="8.0" />
                                     </HBox.margin>
@@ -160,12 +168,12 @@
                         </HBox>
                         <HBox depthTest="ENABLE" layoutX="25.0" layoutY="55.0" styleClass="dialect-container">
                             <children>
-                                <Label fx:id="dialect3" styleClass="dialect-label" text="Dialect #3">
+                                <Label fx:id="dialect3Label" styleClass="dialect-label" text="Dialect #3">
                                     <opaqueInsets>
                                         <Insets />
                                     </opaqueInsets>
                                 </Label>
-                                <SortedComboBox fx:id="dialectComboBox3" disable="true" prefHeight="28.0" prefWidth="173.0">
+                                <SortedComboBox fx:id="dialectComboBox3" styleClass="blue-arrow-combo-box" disable="true" prefHeight="28.0" prefWidth="173.0">
                                     <HBox.margin>
                                         <Insets bottom="8.0" />
                                     </HBox.margin>
@@ -183,7 +191,14 @@
                         </HBox>
                     </children>
                 </VBox>
+
+                <!-- Comments -->
+                <TextArea fx:id="commentsTextArea" styleClass="komet-text-area" maxHeight="80.0" maxWidth="1.7976931348623157E308" text="Add comment here..." GridPane.columnSpan="2" GridPane.rowIndex="7" GridPane.valignment="TOP">
+                    <GridPane.margin>
+                        <Insets left="15.0" right="15.0" />
+                    </GridPane.margin>
+                </TextArea>
             </children>
         </GridPane>
     </center>
-</BorderPane>
+</BorderPane>
\ No newline at end of file
diff --git a/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/edit-other-name-form.fxml b/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/edit-other-name-form.fxml
index c5edbe2b7..a27a50a58 100644
--- a/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/edit-other-name-form.fxml
+++ b/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/edit-other-name-form.fxml
@@ -4,6 +4,7 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextArea?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
@@ -15,164 +16,189 @@
 
 <BorderPane minWidth="100.0" prefWidth="487.0" stylesheets="@../kview.css" xmlns="http://javafx.com/javafx/23" xmlns:fx="http://javafx.com/fxml/1">
     <top>
-        <HBox alignment="TOP_CENTER" styleClass="edit-concept-label-container" BorderPane.alignment="TOP_CENTER">
+        <HBox alignment="TOP_CENTER" minHeight="40.0" prefHeight="40.0" prefWidth="0.0" styleClass="edit-concept-label-container" BorderPane.alignment="TOP_CENTER">
             <children>
                 <Label fx:id="editDescriptionTitleLabel" alignment="TOP_CENTER" text="Edit Description: Other Name" textAlignment="CENTER" />
             </children>
         </HBox>
     </top>
+    <bottom>
+        <VBox alignment="TOP_CENTER" BorderPane.alignment="CENTER" minHeight="80.0" prefHeight="80.0">
+            <children>
+                <HBox alignment="BOTTOM_RIGHT" styleClass="add-description-bottom-label">
+                    <children>
+                        <Label text="Purpose of this semantic is to help define this concept." />
+                    </children>
+                </HBox>
+                <HBox alignment="BOTTOM_RIGHT" layoutX="10.0" layoutY="110.0" prefHeight="50.0" prefWidth="200.0">
+                    <children>
+                        <ButtonBar prefHeight="75.0" prefWidth="200.0">
+                            <buttons>
+                                <Button fx:id="cancelButton" mnemonicParsing="false" onAction="#handleCancelButtonEvent" styleClass="edit-concept-cancel-button" text="CANCEL" />
+                                <Button fx:id="submitButton" layoutX="135.0" layoutY="47.0" minWidth="63.0" mnemonicParsing="false" onAction="#updateOtherName" styleClass="edit-concept-submit-button" text="SUBMIT" />
+                            </buttons>
+                        </ButtonBar>
+                    </children>
+                    <opaqueInsets>
+                        <Insets />
+                    </opaqueInsets>
+                    <VBox.margin>
+                        <Insets right="20.0" />
+                    </VBox.margin>
+                </HBox>
+            </children>
+        </VBox>
+    </bottom>
     <center>
-      <VBox BorderPane.alignment="CENTER">
-         <children>
-              <GridPane prefWidth="487.0">
-                  <columnConstraints>
-                      <ColumnConstraints hgrow="SOMETIMES" maxWidth="100.0" minWidth="100.0" prefWidth="100.0" />
-                      <ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" prefWidth="400.0" />
-                  </columnConstraints>
-                  <rowConstraints>
-                      <RowConstraints maxHeight="40.0" minHeight="10.0" prefHeight="40.0" vgrow="SOMETIMES" />
-                      <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
-                      <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
-                      <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
-                      <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
-                  <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
-                  <RowConstraints />
-                  <RowConstraints maxHeight="1.7976931348623157E308" vgrow="SOMETIMES" />
-                  </rowConstraints>
-                  <children>
-                      <Label styleClass="add-description-label" text="Name" />
-                      <Label styleClass="add-description-label" text="Type" GridPane.rowIndex="1" />
-                      <Label prefWidth="100.0" styleClass="add-description-label" text="Case Significance" wrapText="true" GridPane.rowIndex="2" />
-                      <Label styleClass="add-description-label" text="Language" GridPane.rowIndex="5" />
-                      <Label styleClass="add-description-label" text="Status" GridPane.rowIndex="3" />
-                      <Label styleClass="add-description-label" text="Module" GridPane.rowIndex="4" />
-                      <TextField styleClass="komet-text-field" fx:id="otherNameTextField" prefHeight="25.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS">
-                     <GridPane.margin>
+        <GridPane prefWidth="487.0" BorderPane.alignment="CENTER">
+            <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="100.0" minWidth="100.0" prefWidth="100.0" />
+                <ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" prefWidth="400.0" />
+            </columnConstraints>
+            <rowConstraints>
+                <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+                <!-- Dialects section  -->
+                <RowConstraints fx:id="dialectCommentsRowConstraints"  minHeight="200.0" prefHeight="200.0" maxHeight="200.0" vgrow="SOMETIMES" />
+                <!-- Comments section -->
+                <RowConstraints vgrow="SOMETIMES" minHeight="80.0"/>
+            </rowConstraints>
+            <children>
+                <Label styleClass="add-description-label" text="Name" GridPane.rowIndex="0"  />
+                <Label styleClass="add-description-label" text="Type" GridPane.rowIndex="1" />
+                <Label prefWidth="100.0" styleClass="add-description-label" text="Case Significance" wrapText="true" GridPane.rowIndex="2" />
+                <Label styleClass="add-description-label" text="Status" GridPane.rowIndex="3" />
+                <Label styleClass="add-description-label" text="Module" GridPane.rowIndex="4" />
+                <Label styleClass="add-description-label" text="Language" GridPane.rowIndex="5" />
+
+                <!-- Name field -->
+                <TextField fx:id="otherNameTextField" styleClass="komet-text-field" prefHeight="25.0" promptText="Enter Name" GridPane.columnIndex="1" GridPane.rowIndex="0" GridPane.hgrow="ALWAYS">
+                    <GridPane.margin>
                         <Insets right="15.0" />
-                     </GridPane.margin></TextField>
-                      <SortedComboBox styleClass="blue-arrow-combo-box" disable="true" maxWidth="1.7976931348623157E308" prefHeight="25.0" prefWidth="310.0" promptText="Other Name" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1">
-                     <GridPane.margin>
+                    </GridPane.margin>
+                </TextField>
+
+                <!-- Type display (disabled combo box used as label) -->
+                <SortedComboBox fx:id="typeDisplayComboBox" styleClass="blue-arrow-combo-box" disable="true" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Type" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1">
+                    <GridPane.margin>
                         <Insets right="15.0" />
-                     </GridPane.margin></SortedComboBox>
-                      <SortedComboBox styleClass="blue-arrow-combo-box" fx:id="caseSignificanceComboBox" maxWidth="1.7976931348623157E308" prefHeight="25.0" prefWidth="310.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2">
-                     <GridPane.margin>
+                    </GridPane.margin>
+                </SortedComboBox>
+
+                <!-- Case Significance -->
+                <SortedComboBox fx:id="caseSignificanceComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select case sensitivity" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2">
+                    <GridPane.margin>
                         <Insets right="15.0" />
-                     </GridPane.margin></SortedComboBox>
-                      <SortedComboBox styleClass="blue-arrow-combo-box" fx:id="languageComboBox" maxWidth="1.7976931348623157E308" prefHeight="25.0" prefWidth="310.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="5">
-                     <GridPane.margin>
+                    </GridPane.margin>
+                </SortedComboBox>
+
+                <!-- Status -->
+                <SortedComboBox fx:id="statusComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Status" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3">
+                    <GridPane.margin>
                         <Insets right="15.0" />
-                     </GridPane.margin></SortedComboBox>
-                      <SortedComboBox styleClass="blue-arrow-combo-box" fx:id="statusComboBox" maxWidth="1.7976931348623157E308" prefHeight="25.0" prefWidth="310.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3">
-                     <GridPane.margin>
+                    </GridPane.margin>
+                </SortedComboBox>
+
+                <!-- Module -->
+                <SortedComboBox fx:id="moduleComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Module" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="4">
+                    <GridPane.margin>
                         <Insets right="15.0" />
-                     </GridPane.margin></SortedComboBox>
-                      <SortedComboBox styleClass="blue-arrow-combo-box" fx:id="moduleComboBox" maxWidth="1.7976931348623157E308" prefHeight="25.0" prefWidth="310.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="4">
-                     <GridPane.margin>
+                    </GridPane.margin>
+                </SortedComboBox>
+
+                <!-- Language -->
+                <SortedComboBox fx:id="languageComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Language" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="5">
+                    <GridPane.margin>
                         <Insets right="15.0" />
-                     </GridPane.margin></SortedComboBox>
-                  <VBox GridPane.columnSpan="2" GridPane.rowIndex="6">
-                     <children>
-                        <HBox depthTest="ENABLE" styleClass="dialect-container" VBox.vgrow="ALWAYS">
-                           <children>
-                              <Label fx:id="dialect1" prefHeight="24.0" prefWidth="280.0" styleClass="dialect-label" text="Dialect #1">
-                                 <opaqueInsets>
-                                    <Insets />
-                                 </opaqueInsets>
-                              </Label>
-                              <SortedComboBox styleClass="blue-arrow-combo-box" fx:id="dialectComboBox1" disable="true" prefHeight="28.0" prefWidth="173.0">
-                                 <HBox.margin>
-                                    <Insets bottom="8.0" />
-                                 </HBox.margin>
-                              </SortedComboBox>
-                           </children>
-                           <opaqueInsets>
-                              <Insets />
-                           </opaqueInsets>
-                           <padding>
-                              <Insets right="15.0" />
-                           </padding>
-                           <VBox.margin>
-                              <Insets left="15.0" right="15.0" top="15.0" />
-                           </VBox.margin>
+                    </GridPane.margin>
+                </SortedComboBox>
+
+                <!-- Dialects section (hidden by default for add modes) -->
+                <VBox fx:id="dialectsContainer" GridPane.columnSpan="2" GridPane.rowIndex="6">
+                    <children>
+                        <HBox depthTest="ENABLE" styleClass="dialect-container">
+                            <children>
+                                <Label fx:id="dialect1Label" prefHeight="24.0" prefWidth="280.0" styleClass="dialect-label" text="Dialect #1">
+                                    <opaqueInsets>
+                                        <Insets />
+                                    </opaqueInsets>
+                                </Label>
+                                <SortedComboBox fx:id="dialectComboBox1" styleClass="blue-arrow-combo-box" disable="true" prefHeight="28.0" prefWidth="173.0">
+                                    <HBox.margin>
+                                        <Insets bottom="8.0" />
+                                    </HBox.margin>
+                                </SortedComboBox>
+                            </children>
+                            <opaqueInsets>
+                                <Insets />
+                            </opaqueInsets>
+                            <padding>
+                                <Insets right="15.0" />
+                            </padding>
+                            <VBox.margin>
+                                <Insets left="15.0" right="15.0" top="15.0" />
+                            </VBox.margin>
                         </HBox>
                         <HBox depthTest="ENABLE" layoutX="25.0" layoutY="10.0" styleClass="dialect-container">
-                           <children>
-                              <Label fx:id="dialect2" prefHeight="24.0" prefWidth="280.0" styleClass="dialect-label" text="Dialect #2">
-                                 <opaqueInsets>
-                                    <Insets />
-                                 </opaqueInsets>
-                              </Label>
-                              <SortedComboBox styleClass="blue-arrow-combo-box" fx:id="dialectComboBox2" disable="true" prefHeight="28.0" prefWidth="173.0">
-                                 <HBox.margin>
-                                    <Insets bottom="8.0" />
-                                 </HBox.margin>
-                              </SortedComboBox>
-                           </children>
-                           <opaqueInsets>
-                              <Insets />
-                           </opaqueInsets>
-                           <padding>
-                              <Insets right="15.0" />
-                           </padding>
-                           <VBox.margin>
-                              <Insets left="15.0" right="15.0" top="15.0" />
-                           </VBox.margin>
+                            <children>
+                                <Label fx:id="dialect2Label" prefHeight="24.0" prefWidth="280.0" styleClass="dialect-label" text="Dialect #2">
+                                    <opaqueInsets>
+                                        <Insets />
+                                    </opaqueInsets>
+                                </Label>
+                                <SortedComboBox fx:id="dialectComboBox2" styleClass="blue-arrow-combo-box" disable="true" prefHeight="28.0" prefWidth="173.0">
+                                    <HBox.margin>
+                                        <Insets bottom="8.0" />
+                                    </HBox.margin>
+                                </SortedComboBox>
+                            </children>
+                            <opaqueInsets>
+                                <Insets />
+                            </opaqueInsets>
+                            <padding>
+                                <Insets right="15.0" />
+                            </padding>
+                            <VBox.margin>
+                                <Insets left="15.0" right="15.0" top="15.0" />
+                            </VBox.margin>
                         </HBox>
                         <HBox depthTest="ENABLE" layoutX="25.0" layoutY="55.0" styleClass="dialect-container">
-                           <children>
-                              <Label fx:id="dialect3" styleClass="dialect-label" text="Dialect #3">
-                                 <opaqueInsets>
-                                    <Insets />
-                                 </opaqueInsets>
-                              </Label>
-                              <SortedComboBox styleClass="blue-arrow-combo-box" fx:id="dialectComboBox3" disable="true" prefHeight="28.0" prefWidth="173.0">
-                                 <HBox.margin>
-                                    <Insets bottom="8.0" />
-                                 </HBox.margin>
-                              </SortedComboBox>
-                           </children>
-                           <opaqueInsets>
-                              <Insets />
-                           </opaqueInsets>
-                           <padding>
-                              <Insets right="15.0" />
-                           </padding>
-                           <VBox.margin>
-                              <Insets left="15.0" right="15.0" top="15.0" />
-                           </VBox.margin>
+                            <children>
+                                <Label fx:id="dialect3Label" styleClass="dialect-label" text="Dialect #3">
+                                    <opaqueInsets>
+                                        <Insets />
+                                    </opaqueInsets>
+                                </Label>
+                                <SortedComboBox fx:id="dialectComboBox3" styleClass="blue-arrow-combo-box" disable="true" prefHeight="28.0" prefWidth="173.0">
+                                    <HBox.margin>
+                                        <Insets bottom="8.0" />
+                                    </HBox.margin>
+                                </SortedComboBox>
+                            </children>
+                            <opaqueInsets>
+                                <Insets />
+                            </opaqueInsets>
+                            <padding>
+                                <Insets right="15.0" />
+                            </padding>
+                            <VBox.margin>
+                                <Insets left="15.0" right="15.0" top="15.0" />
+                            </VBox.margin>
                         </HBox>
-                     </children>
-                  </VBox>
-                  </children>
-              </GridPane>
-         </children>
-      </VBox>
+                    </children>
+                </VBox>
+
+                <!-- Comments -->
+                <TextArea fx:id="commentsTextArea" styleClass="komet-text-area" maxHeight="80.0" maxWidth="1.7976931348623157E308" text="Add comment here..." GridPane.columnSpan="2" GridPane.rowIndex="7" GridPane.valignment="TOP">
+                    <GridPane.margin>
+                        <Insets left="15.0" right="15.0" />
+                    </GridPane.margin>
+                </TextArea>
+            </children>
+        </GridPane>
     </center>
-   <bottom>
-       <VBox alignment="BOTTOM_CENTER" prefHeight="100.0" prefWidth="100.0" BorderPane.alignment="CENTER">
-           <children>
-               <HBox alignment="BOTTOM_RIGHT" styleClass="add-description-bottom-label">
-                   <children>
-                       <Label text="Purpose of this semantic is to help define this concept." />
-                   </children>
-               </HBox>
-               <HBox alignment="BOTTOM_RIGHT" layoutX="10.0" layoutY="110.0" prefHeight="50.0" prefWidth="200.0">
-                   <children>
-                       <ButtonBar prefHeight="75.0" prefWidth="200.0">
-                           <buttons>
-                               <Button fx:id="cancelButton" mnemonicParsing="false" onAction="#handleCancelButtonEvent" styleClass="edit-concept-cancel-button" text="CANCEL" />
-                               <Button fx:id="submitButton" layoutX="135.0" layoutY="47.0" minWidth="63.0" mnemonicParsing="false" onAction="#updateOtherName" styleClass="edit-concept-submit-button" text="SUBMIT" />
-                           </buttons>
-                       </ButtonBar>
-                   </children>
-                   <opaqueInsets>
-                       <Insets />
-                   </opaqueInsets>
-                   <VBox.margin>
-                       <Insets right="20.0" />
-                   </VBox.margin>
-               </HBox>
-           </children>
-       </VBox>
-   </bottom>
-</BorderPane>
+</BorderPane>
\ No newline at end of file