diff --git a/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertiesStep.java b/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertiesStep.java
index 681ef5b2b..aa274283d 100755
--- a/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertiesStep.java
+++ b/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertiesStep.java
@@ -55,7 +55,7 @@ public class ArticlePropertiesStep extends GenericArticlePropertiesStep {
         BasicPageForm editSheet;
         editSheet = new ArticlePropertyForm(itemModel, this);
         add(EDIT_SHEET_NAME, 
-            "Edit",    // curently add accepts just a String, not a Label
+            GlobalizationUtil.globalize("cms.ui.edit"), 
             new WorkflowLockedComponentAccess(editSheet, itemModel), 
             editSheet.getSaveCancelSection().getCancelButton());
     }
diff --git a/ccm-cms-types-bookmark/src/com/arsdigita/cms/contenttypes/ui/BookmarkPropertiesStep.java b/ccm-cms-types-bookmark/src/com/arsdigita/cms/contenttypes/ui/BookmarkPropertiesStep.java
index 5a09497d8..0dfc10e27 100755
--- a/ccm-cms-types-bookmark/src/com/arsdigita/cms/contenttypes/ui/BookmarkPropertiesStep.java
+++ b/ccm-cms-types-bookmark/src/com/arsdigita/cms/contenttypes/ui/BookmarkPropertiesStep.java
@@ -49,7 +49,8 @@ public class BookmarkPropertiesStep extends SimpleEditStep {
         BasicPageForm editSheet;
 
         editSheet = new BookmarkPropertyForm( itemModel );
-        add( EDIT_SHEET_NAME, "Edit", 
+        add( EDIT_SHEET_NAME, 
+             GlobalizationUtil.globalize("cms.ui.edit"), 
              new WorkflowLockedComponentAccess(editSheet, itemModel),
              editSheet.getSaveCancelSection().getCancelButton() );
 
diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties
index 903222d4d..b69b0cfca 100755
--- a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties
+++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties
@@ -286,7 +286,7 @@ cms.ui.authoring.sql_error_in_getting_byte_content=SQL Fehler beim Holen von Bin
 cms.ui.authoring.sqle=SQLE
 cms.ui.authoring.steps=Authoring steps
 cms.ui.authoring.submission_cancelled=Submission Cancelled
-cms.ui.authoring.text_type=Text Type:
+cms.ui.authoring.text_type=Art des Textes:
 cms.ui.authoring.this_article_does_not_have_an_image=Dieser Artikel hat kein Bild.
 cms.ui.authoring.title=Titel der Seite:
 cms.ui.authoring.unable_to_load_file=Datei konnte nicht geladen werden:
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ContentGroupPropertiesStep.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ContentGroupPropertiesStep.java
index d62f8ad6a..64cb53ef9 100755
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ContentGroupPropertiesStep.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ContentGroupPropertiesStep.java
@@ -55,7 +55,9 @@ public abstract class ContentGroupPropertiesStep extends SimpleEditStep {
         BasicItemForm editSheet;
 
         editSheet = getPropertyForm(itemModel);
-        add( EDIT_SHEET_NAME, "Edit", editSheet,
+        add( EDIT_SHEET_NAME, 
+             GlobalizationUtil.globalize("cms.ui.edit"), 
+             editSheet,
              editSheet.getSaveCancelSection().getCancelButton() );
         
         setDisplayComponent( getPropertySheet( itemModel ) );
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericAddressPropertiesStep.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericAddressPropertiesStep.java
index f97078bff..b1a52e802 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericAddressPropertiesStep.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericAddressPropertiesStep.java
@@ -62,7 +62,7 @@ public class GenericAddressPropertiesStep extends SimpleEditStep {
         BasicPageForm editSheet;
         editSheet = new GenericAddressPropertyForm(itemModel, this);
         add(EDIT_SHEET_NAME, 
-            "Edit", 
+            GlobalizationUtil.globalize("cms.ui.edit"), 
             new WorkflowLockedComponentAccess(editSheet, itemModel), 
             editSheet.getSaveCancelSection().getCancelButton());
     }
@@ -74,6 +74,13 @@ public class GenericAddressPropertiesStep extends SimpleEditStep {
                   .globalize("cms.contenttypes.ui.title"), GenericAddress.TITLE);
         sheet.add(GlobalizationUtil
                   .globalize("cms.contenttypes.ui.name"), GenericAddress.NAME);
+        if (!ContentSection.getConfig().getHideLaunchDate()) {
+            sheet.add(GlobalizationUtil
+                      .globalize("cms.contenttypes.ui.launch_date"),
+                      ContentPage.LAUNCH_DATE,
+                      new LaunchDateAttributeFormatter() );
+        }
+
         sheet.add(ContenttypesGlobalizationUtil
                   .globalize("cms.contenttypes.ui.address.address"), 
                   GenericAddress.ADDRESS);
@@ -107,29 +114,6 @@ public class GenericAddressPropertiesStep extends SimpleEditStep {
                     }
                 });
 
-        if (!ContentSection.getConfig().getHideLaunchDate()) {
-            sheet.add(GlobalizationUtil
-                      .globalize("cms.ui.authoring.page_launch_date"),
-                    ContentPage.LAUNCH_DATE,
-                    new DomainObjectPropertySheet.AttributeFormatter() {
-
-                        public String format(DomainObject item,
-                                String attribute,
-                                PageState state) {
-                            ContentPage page = (ContentPage) item;
-                            if (page.getLaunchDate() != null) {
-                                return DateFormat
-                                       .getDateInstance(DateFormat.LONG)
-                                       .format(page.getLaunchDate());
-                            } else {
-                                return (String) GlobalizationUtil
-                                                .globalize("cms.ui.unknown")
-                                                .localize();
-                            }
-                        }
-                    });
-        }
-
         return sheet;
     }
 }
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBody.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBody.java
index 1f3101d83..773ecbb25 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBody.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBody.java
@@ -135,21 +135,25 @@ public abstract class TextAssetBody extends SecurityPropertyEditor
         if (!s_config.getHideTextAssetUploadFile()) {
             PageFileForm f = getPageFileForm();
             addFileWidgets(f);
-            add(FILE_UPLOAD, "Upload a file", f,
+            add(FILE_UPLOAD, 
+            GlobalizationUtil.globalize("cms.ui.upload"), 
+                    f,
                 f.getSaveCancelSection().getCancelButton());
         }
 
         PageTextForm t = new PageTextForm();
         addTextWidgets(t);
-        add(TEXT_ENTRY, "Edit as text", t,
+        add(TEXT_ENTRY, 
+            GlobalizationUtil.globalize("cms.ui.edit"), 
+            t,
             t.getSaveCancelSection().getCancelButton());
 
         // Specify full path to properties of the text asset
         DomainObjectPropertySheet sheet = getBodyPropertySheet(assetModel);
-        sheet.add("Text Type:",
+        sheet.add(GlobalizationUtil.globalize("cms.ui.authoring.text_type"),
                   Asset.MIME_TYPE + "." + MimeType.LABEL);
-        sheet.add((String) GlobalizationUtil.globalize("cms.ui.authoring.body").
-                localize(), TextAsset.CONTENT);
+        sheet.add(GlobalizationUtil.globalize("cms.ui.authoring.body"), 
+                  TextAsset.CONTENT);
 
         setDisplayComponent(sheet);