diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/pagemodel/CategoryTreeComponentForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/pagemodel/CategoryTreeComponentForm.java
index 1fc2f75b4..cb12a3d54 100644
--- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/pagemodel/CategoryTreeComponentForm.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/pagemodel/CategoryTreeComponentForm.java
@@ -60,7 +60,7 @@ public class CategoryTreeComponentForm extends AbstractComponentModelForm<Catego
         showFullTreeCheckbox.addOption(new Option(
             SHOW_FULL_TREE,
             new Label(new GlobalizedMessage(
-                "cms.ui.pagemodel.category_tree_component.show_full_tree.label",
+                "cms.ui.pagemodel.category_tree_component_form.show_full_tree.label",
                 CmsConstants.CMS_BUNDLE))));
         add(showFullTreeCheckbox);
     }
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsResources.properties b/ccm-cms/src/main/resources/org/librecms/CmsResources.properties
index 6850329bd..0329f2702 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsResources.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsResources.properties
@@ -466,3 +466,13 @@ cms.ui.pagemodel.itemlist_component_form.limit_to_type.label=Limit to type
 cms.ui.pagemodel.itemlist_component_form.page_size.label=Number of items per page
 cms.ui.pagemodel.itemlist_component_form.list_order.label=Order list using these properties
 cms.ui.pagemodel.itemlist_component_form.page_size.error.not_a_number=Number of items per page is not a number
+cms.ui.pagemodel.components.categorized_item_component.title=Categorized Item
+cms.ui.pagemodel.components.categorized_item_component.desc=Categorized Item
+cms.ui.pagemodel.components.category_tree_component.title=Category Tree
+cms.ui.pagemodel.components.category_tree_component.desc=Outputs the category tree of the current site/page.
+cms.ui.pagemodel.components.fixed_contentitem_component.title=Fixed Content Item
+cms.ui.pagemodel.components.fixed_contentitem_component.desc=Output a specific Content Item
+cms.ui.pagemodel.components.greetingitem_component.title=Greeting Item
+cms.ui.pagemodel.components.greetingitem_component.desc=Output the index item of the current category.
+cms.ui.pagemodel.components.itemlist_component.title=Item List
+cms.ui.pagemodel.components.itemlist_component.desc=Outputs a list of all content items (without the index item) assigned to the current category.
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties b/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties
index a333d6034..6344527ba 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties
@@ -463,3 +463,13 @@ cms.ui.pagemodel.itemlist_component_form.limit_to_type.label=Auf Typ beschr\u00e
 cms.ui.pagemodel.itemlist_component_form.page_size.label=Anzahl von Objekten pro Seite
 cms.ui.pagemodel.itemlist_component_form.list_order.label=List nach diesen Eigenschaften sortieren
 cms.ui.pagemodel.itemlist_component_form.page_size.error.not_a_number=Die Anzahl der Objekte pro Seite ist keine Zahl.
+cms.ui.pagemodel.components.categorized_item_component.title=Categorized Item
+cms.ui.pagemodel.components.categorized_item_component.desc=Categorized Item
+cms.ui.pagemodel.components.category_tree_component.title=Kategorienbaum
+cms.ui.pagemodel.components.category_tree_component.desc=Gibt den Kategorienbaum der aktuellen Navigation aus.
+cms.ui.pagemodel.components.fixed_contentitem_component.title=Spezifisches Content Item
+cms.ui.pagemodel.components.fixed_contentitem_component.desc=Gibt ein bestimmtes Content Item aus.
+cms.ui.pagemodel.components.greetingitem_component.title=Greeting Item
+cms.ui.pagemodel.components.greetingitem_component.desc=Gibt das Index-Item der aktuellen Kategorie aus.
+cms.ui.pagemodel.components.itemlist_component.title=Item Liste
+cms.ui.pagemodel.components.itemlist_component.desc=Gibt eine Liste aller ContentItems aus, die der aktuellen Kategorie zugeordnet sind.
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties b/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties
index f5eeadb13..0d900fba9 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties
@@ -422,3 +422,13 @@ cms.ui.pagemodel.itemlist_component_form.limit_to_type.label=Limit to type
 cms.ui.pagemodel.itemlist_component_form.page_size.label=Number of items per page
 cms.ui.pagemodel.itemlist_component_form.list_order.label=Order list using these properties
 cms.ui.pagemodel.itemlist_component_form.page_size.error.not_a_number=Number of items per page is not a number
+cms.ui.pagemodel.components.categorized_item_component.title=Categorized Item
+cms.ui.pagemodel.components.categorized_item_component.desc=Categorized Item
+cms.ui.pagemodel.components.category_tree_component.title=Category Tree
+cms.ui.pagemodel.components.category_tree_component.desc=Outputs the category tree of the current site/page.
+cms.ui.pagemodel.components.fixed_contentitem_component.title=Fixed Content Item
+cms.ui.pagemodel.components.fixed_contentitem_component.desc=Output a specific Content Item
+cms.ui.pagemodel.components.greetingitem_component.title=Greeting Item
+cms.ui.pagemodel.components.greetingitem_component.desc=Output the index item of the current category.
+cms.ui.pagemodel.components.itemlist_component.title=Item List
+cms.ui.pagemodel.components.itemlist_component.desc=Outputs a list of all content items (without the index item) assigned to the current category.
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/pagemodels/PageModelDetails.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/pagemodels/PageModelDetails.java
index 1d437b8a0..1588f9fb6 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/admin/pagemodels/PageModelDetails.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/pagemodels/PageModelDetails.java
@@ -145,6 +145,8 @@ class PageModelDetails extends BoxPanel {
                 "ui.admin.pagemodels.add_new_component.submit",
                 AdminUiConstants.ADMIN_BUNDLE));
             super.add(submit);
+            
+            super.addProcessListener(this);
         }
 
         @Override
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/pagemodels/PageModelTab.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/pagemodels/PageModelTab.java
index ae1a4d6bf..9c30c4dca 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/admin/pagemodels/PageModelTab.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/pagemodels/PageModelTab.java
@@ -158,9 +158,9 @@ public class PageModelTab extends LayoutPanel {
     protected void showComponentForm(final PageState state) {
         addNewModel.setVisible(state, false);
         pageModelsTable.setVisible(state, false);
-        pageModelDetails.setVisible(state, true);
+        pageModelDetails.setVisible(state, false);
         pageModelForm.setVisible(state, false);
-        componentForm.setVisible(state, false);
+        componentForm.setVisible(state, true);
     }
 
     protected void showPageModelDetails(final PageState state) {
diff --git a/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources.properties b/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources.properties
index 7e0591d34..35d627505 100644
--- a/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources.properties
+++ b/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources.properties
@@ -679,3 +679,4 @@ ui.admin.pagemodels.details.model_desc=Description
 ui.admin.pagemodels.details.edit_properties=Edit properties
 ui.admin.pagemodels.components.key.label=ID
 ui.admin.pagemodels.components.key.error.not_empty=The ID of a component can't be empty.
+ui.admin.pagemodels.table.columns.remove.label=Delete
diff --git a/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_de.properties b/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_de.properties
index d7a58acc7..f45f50472 100644
--- a/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_de.properties
+++ b/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_de.properties
@@ -683,3 +683,4 @@ ui.admin.pagemodels.details.model_desc=Beschreibung
 ui.admin.pagemodels.details.edit_properties=Bearbeiten
 ui.admin.pagemodels.components.key.label=ID
 ui.admin.pagemodels.components.key.error.not_empty=Die ID einer Komponente darf nicht leer sein.
+ui.admin.pagemodels.table.columns.remove.label=L\u00f6schen
diff --git a/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_en.properties b/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_en.properties
index ee3cde28a..46d0ae50d 100755
--- a/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_en.properties
+++ b/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_en.properties
@@ -676,3 +676,4 @@ ui.admin.pagemodels.details.model_desc=Description
 ui.admin.pagemodels.details.edit_properties=Edit properties
 ui.admin.pagemodels.components.key.label=ID
 ui.admin.pagemodels.components.key.error.not_empty=The ID of a component can't be empty.
+ui.admin.pagemodels.table.columns.remove.label=Delete
diff --git a/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_fr.properties b/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_fr.properties
index 8eb17d51a..48b4a49d8 100755
--- a/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_fr.properties
+++ b/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_fr.properties
@@ -667,3 +667,4 @@ ui.admin.pagemodels.details.model_desc=Description
 ui.admin.pagemodels.details.edit_properties=Edit properties
 ui.admin.pagemodels.components.key.label=ID
 ui.admin.pagemodels.components.key.error.not_empty=The ID of a component can't be empty.
+ui.admin.pagemodels.table.columns.remove.label=Delete