diff --git a/ifc_import.py b/ifc_import.py
index e6553c3..a90d363 100644
--- a/ifc_import.py
+++ b/ifc_import.py
@@ -131,7 +131,7 @@ def get_options(
         switchwb = params.GetBool("SwitchWB", True)
     if silent:
         return strategy, shapemode, switchwb
-    ask = params.GetBool("AskAgain", True)
+    ask = params.GetBool("AskAgain", False)
     if ask and FreeCAD.GuiUp:
         import FreeCADGui
         from PySide import QtGui
diff --git a/ui/dialogImport.ui b/ui/dialogImport.ui
index 7fd1e78..1c801ef 100644
--- a/ui/dialogImport.ui
+++ b/ui/dialogImport.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>370</width>
-    <height>371</height>
+    <width>551</width>
+    <height>340</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -23,80 +23,80 @@
        </property>
        <item>
         <property name="text">
-         <string>Only root object</string>
+         <string>Only root object (default)</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>Project structure</string>
+         <string>Project structure (levels)</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>All individual products</string>
+         <string>All individual IFC objects</string>
         </property>
        </item>
       </widget>
      </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="label_2">
+     <item row="1" column="0">
+      <widget class="QLabel" name="label">
        <property name="text">
-        <string>Objects type</string>
+        <string>Initial import</string>
        </property>
       </widget>
      </item>
      <item row="3" column="1">
-      <widget class="QComboBox" name="comboShapeMode">
+      <widget class="QComboBox" name="comboSingleDoc">
        <property name="toolTip">
-        <string>The type of object created at import. Mesh is faster, but Shapes are more precise. You can convert between the two anytime by right-clicking the object tree</string>
-       </property>
-       <property name="currentIndex">
-        <number>0</number>
+        <string>This defines how the IFC data is stored in the FreeCAD document. 'Single IFC document' means that the FreeCAD document is the IFC document, anything you create in it belongs to the IFC document too. 'Use IFCdocument object' means that an object will be created inside the FreeCAD document to represent the IFC document. You will be able to add non-IFC objects alongside.</string>
        </property>
        <item>
         <property name="text">
-         <string>Full shape</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Coin representation only</string>
+         <string>Locked (IFC objects only)</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>No 3D representation</string>
+         <string>Unlocked (non-IFC objects permitted)</string>
         </property>
        </item>
       </widget>
      </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label">
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_3">
        <property name="text">
-        <string>Initial import</string>
+        <string>Lock document</string>
        </property>
       </widget>
      </item>
      <item row="2" column="0">
-      <widget class="QLabel" name="label_3">
+      <widget class="QLabel" name="label_2">
        <property name="text">
-        <string>Document type</string>
+        <string>Representation type</string>
        </property>
       </widget>
      </item>
      <item row="2" column="1">
-      <widget class="QComboBox" name="comboSingleDoc">
+      <widget class="QComboBox" name="comboShapeMode">
        <property name="toolTip">
-        <string>This defines how the IFC data is stored in the FreeCAD document. 'Single IFC document' means that the FreeCAD document is the IFC document, anything you create in it belongs to the IFC document too. 'Use IFCdocument object' means that an object will be created inside the FreeCAD document to represent the IFC document. You will be able to add non-IFC objects alongside.</string>
+        <string>The type of object created at import. Mesh is faster, but Shapes are more precise. You can convert between the two anytime by right-clicking the object tree</string>
+       </property>
+       <property name="currentIndex">
+        <number>1</number>
        </property>
        <item>
         <property name="text">
-         <string>Single IFC document</string>
+         <string>Load the shape (slower)</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>Use IFC document object</string>
+         <string>Load 3D representation only, no shape (default)</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>No 3D representation at all</string>
         </property>
        </item>
       </widget>
@@ -113,16 +113,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QCheckBox" name="checkLoadOrphans">
-     <property name="toolTip">
-      <string>If this is marked, objects not belonging to any project will be loaded too and placed in a separate group</string>
-     </property>
-     <property name="text">
-      <string>Load orphan objects</string>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QCheckBox" name="checkLoadPsets">
      <property name="toolTip">
@@ -162,7 +152,7 @@
       <string>Ask me again next time</string>
      </property>
      <property name="checked">
-      <bool>true</bool>
+      <bool>false</bool>
      </property>
     </widget>
    </item>
diff --git a/ui/preferencesNativeIFC.ui b/ui/preferencesNativeIFC.ui
index 88e7c01..ee82057 100644
--- a/ui/preferencesNativeIFC.ui
+++ b/ui/preferencesNativeIFC.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>454</width>
+    <width>678</width>
     <height>663</height>
    </rect>
   </property>
@@ -42,17 +42,17 @@
           </property>
           <item>
            <property name="text">
-            <string>Only root object</string>
+            <string>Only root object (default)</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>Project structure</string>
+            <string>Project structure (levels)</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>All individual products</string>
+            <string>All individual IFC objects</string>
            </property>
           </item>
          </widget>
@@ -60,7 +60,7 @@
         <item row="2" column="0">
          <widget class="QLabel" name="label_2">
           <property name="text">
-           <string>Objects type</string>
+           <string>Representation type</string>
           </property>
          </widget>
         </item>
@@ -70,7 +70,7 @@
            <string>The type of object created at import. Coin only is much faster, but you don't get the full shape information. You can convert between the two anytime by right-clicking the object tree</string>
           </property>
           <property name="currentIndex">
-           <number>0</number>
+           <number>1</number>
           </property>
           <property name="prefEntry" stdset="0">
            <cstring>ShapeMode</cstring>
@@ -80,17 +80,17 @@
           </property>
           <item>
            <property name="text">
-            <string>Full shape</string>
+            <string>Load full shape (slower)</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>Coin representation only</string>
+            <string>Load 3D representation only, no shape (default)</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>No 3D representation</string>
+            <string>No 3D representation at all</string>
            </property>
           </item>
          </widget>
@@ -113,22 +113,6 @@
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="Gui::PrefCheckBox" name="checkBox_6">
-        <property name="toolTip">
-         <string>If this is marked, objects not belonging to any project will be loaded too and placed in a separate group</string>
-        </property>
-        <property name="text">
-         <string>Load orphan objects</string>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>LoadOrphans</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/NativeIFC</cstring>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="Gui::PrefCheckBox" name="checkBox_7">
         <property name="toolTip">
@@ -178,18 +162,15 @@
        </widget>
       </item>
       <item>
-       <widget class="Gui::PrefCheckBox" name="checkBox">
+       <widget class="Gui::PrefCheckBox" name="checkBox_10">
         <property name="toolTip">
-         <string>If this is checked, a dialog will be shown at each import</string>
+         <string>When enabling this, the original version of objects dropped onto an IFC project tree will not be deleted.</string>
         </property>
         <property name="text">
-         <string>Show options dialog when importing</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
+         <string>Keep original version of aggregated objects</string>
         </property>
         <property name="prefEntry" stdset="0">
-         <cstring>AskAgain</cstring>
+         <cstring>KeepAggregated</cstring>
         </property>
         <property name="prefPath" stdset="0">
          <cstring>Mod/NativeIFC</cstring>
@@ -197,31 +178,18 @@
        </widget>
       </item>
       <item>
-       <widget class="Gui::PrefCheckBox" name="checkBox_9">
+       <widget class="Gui::PrefCheckBox" name="checkBox">
         <property name="toolTip">
-         <string>By default, groups containing non-geometrical data in an IFC document are hidden in the tree. You can show them by right-clicking the IFC document and selecting 'Shoiw hidden objects'. By enabling this setting, these groups will not be hidden by default anymore.</string>
+         <string>If this is checked, a dialog will be shown at each import</string>
         </property>
         <property name="text">
-         <string>Show data groups</string>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>ShowDataGroups</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/NativeIFC</cstring>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="Gui::PrefCheckBox" name="checkBox_10">
-        <property name="toolTip">
-         <string>When enabling this, the original version of objects dropped onto an IFC project tree will not be deleted.</string>
+         <string>Show options dialog when importing</string>
         </property>
-        <property name="text">
-         <string>Keep original version of aggregated objects</string>
+        <property name="checked">
+         <bool>true</bool>
         </property>
         <property name="prefEntry" stdset="0">
-         <cstring>KeepAggregated</cstring>
+         <cstring>AskAgain</cstring>
         </property>
         <property name="prefPath" stdset="0">
          <cstring>Mod/NativeIFC</cstring>
@@ -265,7 +233,7 @@
       <item>
        <widget class="Gui::PrefCheckBox" name="checkBox_13">
         <property name="text">
-         <string>Turn into an IFC-only document</string>
+         <string>Always lock new documents</string>
         </property>
         <property name="prefEntry" stdset="0">
          <cstring>SingleDoc</cstring>