diff --git a/src/lay/lay/doc/about/def_import_snapshot.png b/src/lay/lay/doc/about/def_import_snapshot.png
index 2502af558..0da6f6303 100644
Binary files a/src/lay/lay/doc/about/def_import_snapshot.png and b/src/lay/lay/doc/about/def_import_snapshot.png differ
diff --git a/src/lay/lay/doc/about/lef_def_import.xml b/src/lay/lay/doc/about/lef_def_import.xml
index 4f9b03365..bf0ed8073 100644
--- a/src/lay/lay/doc/about/lef_def_import.xml
+++ b/src/lay/lay/doc/about/lef_def_import.xml
@@ -141,7 +141,14 @@
       variant notation (see <link href="about/variant_notation.xml"/>) to specify
       value and type of the property name.
     </li>
-    <li><b>Produce outline shapes:</b> If this option is checked, outline shapes are
+    <li><b>Produce inst names:</b> Check this option to assign user properties with the
+      instance name to the component instances created by DEF import.
+      The user property name used for the instance name
+      can be specified in the edit box below the check box. Use KLayout's 
+      variant notation (see <link href="about/variant_notation.xml"/>) to specify
+      value and type of the property name.
+    </li>
+    <li><b>Produce cell outlines:</b> If this option is checked, outline shapes are
       produced for the macros and the design (for DEF import). The layer to be used can 
       be specified in the edit box below. You can use KLayout's usual layer specification
       notation, i.e. "OUTLINE" for a named layer without GDS layer/datatype value, 
@@ -149,6 +156,14 @@
       combination of both. The outline layer is subject to layer mapping as well, so 
       the layer map can be used alternatively to assign GDS layer/datatype numbers.
     </li>
+    <li><b>Produce blockages:</b> If this option is checked, placement blockages
+      are produced as polygons on the layer given right of the check box. Use KLayout's layer
+      notation to specify the layer (see "Produce cell outlines").
+    </li>
+    <li><b>Produce regions:</b> If this option is checked, regions
+      are produced as polygons on the layer given right of the check box. Use KLayout's layer
+      notation to specify the layer (see "Produce cell outlines").
+    </li>
   </ul>
   
   <p>
@@ -168,6 +183,7 @@
     <li><b>Obstructions:</b> generated for obstruction area markers.</li>
     <li><b>Routing:</b> generated for routing geometry.</li>
     <li><b>Pin labels:</b> generated for pin labels.</li>
+    <li><b>Blockages:</b> generated for (component) blockages.</li>
   </ul>  
 
   <p><b>Note:</b> if the suffix of two purposes is identical, the default GDS datatype should
diff --git a/src/lay/lay/doc/about/lef_import_snapshot.png b/src/lay/lay/doc/about/lef_import_snapshot.png
index d4916420a..81c1be033 100644
Binary files a/src/lay/lay/doc/about/lef_import_snapshot.png and b/src/lay/lay/doc/about/lef_import_snapshot.png differ
diff --git a/src/lay/lay/doc/about/lefdef_options_snapshot.png b/src/lay/lay/doc/about/lefdef_options_snapshot.png
index 5f7658285..d128717a4 100644
Binary files a/src/lay/lay/doc/about/lefdef_options_snapshot.png and b/src/lay/lay/doc/about/lefdef_options_snapshot.png differ
diff --git a/src/lay/lay/doc/about/packages.xml b/src/lay/lay/doc/about/packages.xml
index 26902a7f1..7f7b206f8 100644
--- a/src/lay/lay/doc/about/packages.xml
+++ b/src/lay/lay/doc/about/packages.xml
@@ -129,6 +129,8 @@
   folder with other files use your favorite editor of KLayout itself for layout files.
   </p>
 
+  <h2>Deployment inside your organisation</h2>
+
   <p>
   Once a package is finished, it needs to be deployed to make it available to other
   users. Deployment basically means to put it on some public place where others
@@ -136,7 +138,8 @@
   this can be a web server or a folder on 
   a file server. KLayout talks WebDAV, so the web server needs to offer WebDAV 
   access. A subversion (SVN) server provides WebDAV by default, so this is a good
-  choice. For public open source deployment, only certain providers are supported.
+  choice. Git can be used too, but you'll need to mirror the Git repository to 
+  a file system or WebDAV share.
   </p>
 
   <p>
@@ -153,18 +156,13 @@
   once your package is registered there, everyone using KLayout will see it.
   </p>
 
-  <p>
-  There is separate documentation provided for details about the development and deployment
-  process.
-  </p>
-
   <h2>The Package Index</h2>
 
   <p>
-  Packages are published on the Salt.Mine server. This is a web service that delivers a 
+  Public Packages are published on the Salt.Mine server. This is a web service that delivers a 
   packages index with some meta data such as current version, the icon 
   and a brief description. KLayout uses this list to inform users of packages available
-  for installation and available updates. The package index can be served by other
+  for installation and available updates. For local deployment, the package index can be served by other
   ways too. The only requirement is to be accessible by a http, https or file URL.
   </p>
 
diff --git a/src/lay/lay/doc/manual/main_window.png b/src/lay/lay/doc/manual/main_window.png
index 7dae120f8..92452c828 100644
Binary files a/src/lay/lay/doc/manual/main_window.png and b/src/lay/lay/doc/manual/main_window.png differ
diff --git a/src/lay/lay/doc/manual/main_window_org.png b/src/lay/lay/doc/manual/main_window_org.png
new file mode 100644
index 000000000..4b72a7517
Binary files /dev/null and b/src/lay/lay/doc/manual/main_window_org.png differ
diff --git a/src/laybasic/laybasic/layLoadLayoutOptionsDialog.cc b/src/laybasic/laybasic/layLoadLayoutOptionsDialog.cc
index db07b7410..cc0f37144 100644
--- a/src/laybasic/laybasic/layLoadLayoutOptionsDialog.cc
+++ b/src/laybasic/laybasic/layLoadLayoutOptionsDialog.cc
@@ -320,6 +320,7 @@ SpecificLoadLayoutOptionsDialog::SpecificLoadLayoutOptionsDialog (QWidget *paren
       layout->setMargin (0);
       content_frame->setLayout (layout);
 
+      mp_editor->show ();
       mp_editor->setup (specific_options, 0);
 
     }