diff --git a/src/blackgui/components/dbmappingcomponent.ui b/src/blackgui/components/dbmappingcomponent.ui
index 737bc4750..b64b4e20a 100644
--- a/src/blackgui/components/dbmappingcomponent.ui
+++ b/src/blackgui/components/dbmappingcomponent.ui
@@ -250,15 +250,9 @@
          <property name="minimumSize">
           <size>
            <width>0</width>
-           <height>75</height>
+           <height>100</height>
           </size>
          </property>
-         <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
-         </property>
         </widget>
        </item>
       </layout>
diff --git a/src/blackgui/editors/modelmappingform.cpp b/src/blackgui/editors/modelmappingform.cpp
index 7be7cfade..fd7e67b9e 100644
--- a/src/blackgui/editors/modelmappingform.cpp
+++ b/src/blackgui/editors/modelmappingform.cpp
@@ -81,6 +81,7 @@ namespace BlackGui
             ui->le_Id->setText(model.getDbKeyAsString());
             ui->le_Description->setText(model.getDescription());
             ui->le_Name->setText(model.getName());
+            ui->le_FileName->setText(model.getFileName());
             ui->selector_ModelMode->setValue(model.getModelMode());
             ui->selector_Simulator->setValue(model.getSimulator());
             m_originalModel = model;
diff --git a/src/blackgui/editors/modelmappingform.ui b/src/blackgui/editors/modelmappingform.ui
index 6902b2753..f6e1c6e3a 100644
--- a/src/blackgui/editors/modelmappingform.ui
+++ b/src/blackgui/editors/modelmappingform.ui
@@ -6,18 +6,18 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>592</width>
-    <height>95</height>
+    <width>429</width>
+    <height>107</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Model editor</string>
   </property>
   <property name="frameShape">
-   <enum>QFrame::StyledPanel</enum>
+   <enum>QFrame::NoFrame</enum>
   </property>
   <property name="frameShadow">
-   <enum>QFrame::Raised</enum>
+   <enum>QFrame::Plain</enum>
   </property>
   <layout class="QVBoxLayout" name="vl_ModelMappingForm">
    <property name="spacing">
@@ -40,7 +40,7 @@
      <property name="title">
       <string>Simulator model</string>
      </property>
-     <layout class="QGridLayout" name="gl_ModelMappingForm">
+     <layout class="QGridLayout" name="gl_ModelMappingForm" columnstretch="0,1,0,1,2,1,0">
       <property name="leftMargin">
        <number>3</number>
       </property>
@@ -53,8 +53,14 @@
       <property name="bottomMargin">
        <number>3</number>
       </property>
-      <item row="0" column="0">
-       <widget class="BlackGui::CLabelAndIcon" name="lai_Id">
+      <item row="0" column="6" rowspan="3">
+       <widget class="BlackGui::Editors::CValidationIndicator" name="val_Indicator">
+        <property name="minimumSize">
+         <size>
+          <width>10</width>
+          <height>0</height>
+         </size>
+        </property>
         <property name="frameShape">
          <enum>QFrame::StyledPanel</enum>
         </property>
@@ -63,20 +69,17 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="4" colspan="2">
-       <widget class="BlackGui::Components::CSimulatorSelector" name="selector_Simulator">
-        <property name="frameShape">
-         <enum>QFrame::StyledPanel</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
+      <item row="0" column="3" colspan="2">
+       <widget class="QLineEdit" name="le_ModelKey">
+        <property name="placeholderText">
+         <string>Model  key</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="6">
-       <widget class="QPushButton" name="pb_Stash">
-        <property name="text">
-         <string>Stash</string>
+      <item row="2" column="3" colspan="2">
+       <widget class="QLineEdit" name="le_FileName">
+        <property name="readOnly">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
@@ -90,23 +93,6 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="3">
-       <widget class="QLineEdit" name="le_Description">
-        <property name="placeholderText">
-         <string>Model description</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="4">
-       <widget class="QLabel" name="lbl_Updated">
-        <property name="text">
-         <string>Last updated:</string>
-        </property>
-        <property name="buddy">
-         <cstring>le_LastUpdated</cstring>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="2">
        <widget class="QLabel" name="lbl_ModelKey">
         <property name="text">
@@ -117,9 +103,6 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="5">
-       <widget class="QLineEdit" name="le_LastUpdated"/>
-      </item>
       <item row="0" column="1">
        <widget class="QLineEdit" name="le_Id">
         <property name="maximumSize">
@@ -133,13 +116,6 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="3">
-       <widget class="QLineEdit" name="le_ModelKey">
-        <property name="placeholderText">
-         <string>Model  key</string>
-        </property>
-       </widget>
-      </item>
       <item row="1" column="1">
        <widget class="QLineEdit" name="le_Name">
         <property name="placeholderText">
@@ -157,14 +133,39 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="7" rowspan="2">
-       <widget class="BlackGui::Editors::CValidationIndicator" name="val_Indicator">
-        <property name="minimumSize">
-         <size>
-          <width>10</width>
-          <height>0</height>
-         </size>
+      <item row="2" column="2">
+       <widget class="QLabel" name="lbl_Path">
+        <property name="text">
+         <string>File:</string>
         </property>
+       </widget>
+      </item>
+      <item row="2" column="5">
+       <widget class="QPushButton" name="pb_Stash">
+        <property name="text">
+         <string>Stash</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="le_LastUpdated"/>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="lbl_Updated">
+        <property name="text">
+         <string>Updated:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3" colspan="2">
+       <widget class="QLineEdit" name="le_Description">
+        <property name="placeholderText">
+         <string>Model description</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="5">
+       <widget class="BlackGui::Components::CSimulatorSelector" name="selector_Simulator">
         <property name="frameShape">
          <enum>QFrame::StyledPanel</enum>
         </property>
@@ -173,7 +174,17 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="6">
+      <item row="0" column="0">
+       <widget class="BlackGui::CLabelAndIcon" name="lai_Id">
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="5">
        <widget class="BlackGui::Components::CModelModeSelector" name="selector_ModelMode">
         <property name="frameShape">
          <enum>QFrame::StyledPanel</enum>
@@ -219,8 +230,6 @@
   <tabstop>le_ModelKey</tabstop>
   <tabstop>le_Name</tabstop>
   <tabstop>le_Description</tabstop>
-  <tabstop>pb_Stash</tabstop>
-  <tabstop>le_LastUpdated</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/src/blackgui/editors/modelmappingmodifyform.ui b/src/blackgui/editors/modelmappingmodifyform.ui
index 37323ea36..3209dffb6 100644
--- a/src/blackgui/editors/modelmappingmodifyform.ui
+++ b/src/blackgui/editors/modelmappingmodifyform.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>237</width>
+    <width>195</width>
     <height>112</height>
    </rect>
   </property>