diff --git a/browser/configure.zcml b/browser/configure.zcml
index 234c423..c36e68c 100644
--- a/browser/configure.zcml
+++ b/browser/configure.zcml
@@ -3,7 +3,7 @@
 <configure
    xmlns:zope="http://namespaces.zope.org/zope"
    xmlns="http://namespaces.zope.org/browser"
-   i18n_domain="zope">
+   i18n_domain="loops">
 
   <icon
       name="zmi_icon"
@@ -427,7 +427,7 @@
       />
 
   <editform
-      label="Edit"
+      label="Edit Node"
       name="edit.html"
       schema="loops.interfaces.INode"
       fields="title description nodeType viewName body"
diff --git a/layout/base.py b/layout/base.py
index 802bdea..16205f8 100644
--- a/layout/base.py
+++ b/layout/base.py
@@ -60,7 +60,7 @@ class NodeLayoutInstance(LayoutInstance):
         return view
 
 
-class NavigationLayoutInstance(NodeLayoutInstance):
+class SubnodesLayoutInstance(NodeLayoutInstance):
 
     def getLayouts(self, region):
         """ Return sublayout instances specified via subnodes of the current menu node.
diff --git a/layout/browser/configure.zcml b/layout/browser/configure.zcml
index 43563de..d902170 100644
--- a/layout/browser/configure.zcml
+++ b/layout/browser/configure.zcml
@@ -33,14 +33,13 @@
       view="AddLoopsLayoutNode.html" />
 
   <browser:editform
-      label="Edit Node"
+      label="Edit Layout Node"
       name="edit.html"
       schema="loops.layout.interfaces.ILayoutNode"
       fields="title description nodeType viewName pageName body"
       for="loops.layout.interfaces.ILayoutNode"
       template="../../browser/edit.pt"
-      permission="zope.ManageContent"
-      menu="zmi_views" title="Edit Node">
+      permission="zope.ManageContent">
     <widget field="description" height="2" />
     <widget field="body" height="3" />
   </browser:editform>
diff --git a/layout/configure.zcml b/layout/configure.zcml
index 48415a9..9c4b8ee 100644
--- a/layout/configure.zcml
+++ b/layout/configure.zcml
@@ -22,8 +22,8 @@
 
   <zope:adapter
         for="loops.layout.interfaces.ILayoutNode"
-        name="navigation"
-        factory="loops.layout.base.NavigationLayoutInstance" />
+        name="subnodes"
+        factory="loops.layout.base.SubnodesLayoutInstance" />
 
   <zope:adapter
         for="loops.layout.interfaces.ILayoutNode"
diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo
index 86298e7..2d9b225 100644
Binary files a/locales/de/LC_MESSAGES/loops.mo and b/locales/de/LC_MESSAGES/loops.mo differ
diff --git a/locales/de/LC_MESSAGES/loops.po b/locales/de/LC_MESSAGES/loops.po
index d82754c..4049f2b 100644
--- a/locales/de/LC_MESSAGES/loops.po
+++ b/locales/de/LC_MESSAGES/loops.po
@@ -3,7 +3,7 @@ msgstr ""
 
 "Project-Id-Version: $Id$\n"
 "POT-Creation-Date: 2007-05-22 12:00 CET\n"
-"PO-Revision-Date: 2008-12-07 12:00 CET\n"
+"PO-Revision-Date: 2008-12-15 12:00 CET\n"
 "Last-Translator: Helmut Merz <helmutm@cy55.de>\n"
 "Language-Team: loops developers <helmutm@cy55.de>\n"
 "MIME-Version: 1.0\n"
@@ -430,6 +430,27 @@ msgstr "Typ"
 msgid "Node"
 msgstr "Navigationsknoten"
 
+msgid "Contents"
+msgstr "Inhalt"
+
+msgid "Edit"
+msgstr "Bearbeiten"
+
+msgid "Edit Node"
+msgstr "Knoten bearbeiten"
+
+msgid "Edit Layout Node"
+msgstr "Layout-Knoten bearbeiten"
+
+msgid "Configure"
+msgstr "Konfigurieren"
+
+msgid "Add"
+msgstr "Hinzufügen"
+
+msgid "Edit Permissions"
+msgstr "Berechtigungen"
+
 msgid "Top"
 msgstr "Ganz nach oben"
 
@@ -442,8 +463,8 @@ msgstr "Nach unten"
 msgid "Bottom"
 msgstr "Ganz nach unten"
 
-msgid "Edit Permissions"
-msgstr "Berechtigungen bearbeiten"
+msgid "Options"
+msgstr "Optionen"
 
 msgid "Currently assigned target"
 msgstr "Derzeit zugeordnetes Zielobjekt"
diff --git a/security/configure.zcml b/security/configure.zcml
index 0cc142d..d39e3a0 100644
--- a/security/configure.zcml
+++ b/security/configure.zcml
@@ -3,7 +3,7 @@
 <configure
    xmlns:zope="http://namespaces.zope.org/zope"
    xmlns:browser="http://namespaces.zope.org/browser"
-   i18n_domain="zope">
+   i18n_domain="loops">
 
   <zope:adapter factory="loops.security.setter.BaseSecuritySetter" />