diff --git a/lib/WebGUI/Asset/Wobject/Article.pm b/lib/WebGUI/Asset/Wobject/Article.pm
index 633ccff2d..bd2e12074 100644
--- a/lib/WebGUI/Asset/Wobject/Article.pm
+++ b/lib/WebGUI/Asset/Wobject/Article.pm
@@ -60,7 +60,8 @@ sub getEditForm {
 	my $tabform = $self->SUPER::getEditForm();
    	$tabform->getTab("display")->template(
       		-value=>$self->getValue('templateId'),
-      		-namespace=>"Article"
+      		-namespace=>"Article",
+                -label=>WebGUI::International::get(72,"Asset_Article"),
    		);
 	$tabform->getTab("properties")->text(
 		-name=>"linkTitle",
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index eebb9e406..86088589f 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -207,6 +207,7 @@ sub getEditForm {
 		-name=>"templateId",
       		-value=>$self->getValue("templateId"),
       		-namespace=>"DataForm",
+                -label=>WebGUI::International::get(82,"Asset_DataForm"),
 		-afterEdit=>'func=edit',
 		-defaultValue=>"PBtmpl0000000000000141"
    		);
diff --git a/lib/WebGUI/Asset/Wobject/Folder.pm b/lib/WebGUI/Asset/Wobject/Folder.pm
index 0e726b79d..866b52ade 100644
--- a/lib/WebGUI/Asset/Wobject/Folder.pm
+++ b/lib/WebGUI/Asset/Wobject/Folder.pm
@@ -86,6 +86,7 @@ sub getEditForm {
 	my $tabform = $self->SUPER::getEditForm();
    	$tabform->getTab("display")->template(
       		-value=>$self->getValue('templateId'),
+      		-label=>WebGUI::International::get('folder template title', "Asset_Folder"),
       		-namespace=>"Folder"
    		);
 	if ($self->get("assetId") eq "new") {
diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
index 6b05d66eb..2169422c5 100644
--- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm
+++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
@@ -100,6 +100,7 @@ sub getEditForm {
 	my $tabform = $self->SUPER::getEditForm();
    	$tabform->getTab("display")->template(
       		-value=>$self->getValue('templateId'),
+                -label=>WebGUI::International::get('http proxy template title',"Asset_DataForm"),
       		-namespace=>"HttpProxy"
    		);
 	my %hash;
diff --git a/lib/WebGUI/Asset/Wobject/Layout.pm b/lib/WebGUI/Asset/Wobject/Layout.pm
index 512d9e679..2d337e661 100644
--- a/lib/WebGUI/Asset/Wobject/Layout.pm
+++ b/lib/WebGUI/Asset/Wobject/Layout.pm
@@ -95,6 +95,7 @@ sub getEditForm {
 	my $tabform = $self->SUPER::getEditForm();
    	$tabform->getTab("display")->template(
       		-value=>$self->getValue('templateId'),
+      		-label=>WebGUI::International::get('layout template title', 'Asset_Layout'),
       		-namespace=>"Layout"
    		);
 	if ($self->get("assetId") eq "new") {
diff --git a/lib/WebGUI/Asset/Wobject/MessageBoard.pm b/lib/WebGUI/Asset/Wobject/MessageBoard.pm
index c6e6b0b8c..eb034f271 100644
--- a/lib/WebGUI/Asset/Wobject/MessageBoard.pm
+++ b/lib/WebGUI/Asset/Wobject/MessageBoard.pm
@@ -44,7 +44,8 @@ sub getEditForm {
 	my $tabform = $self->SUPER::getEditForm();
    	$tabform->getTab("display")->template(
       		-value=>$self->getValue('templateId'),
-      		-namespace=>"MessageBoard"
+      		-namespace=>"MessageBoard",
+      		-label=>WebGUI::International::get(73,"Asset_MessageBoard");
    		);
 	return $tabform;
 }
diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm
index f612ee562..9c9813d09 100644
--- a/lib/WebGUI/Asset/Wobject/Navigation.pm
+++ b/lib/WebGUI/Asset/Wobject/Navigation.pm
@@ -81,9 +81,11 @@ sub definition {
 sub getEditForm {
 	my $self = shift;
 	my $tabform = $self->SUPER::getEditForm;
+	my $i18n = WebGUI::International->new("Asset_Navigation");
    	$tabform->getTab("display")->template(
       		-value=>$self->getValue('templateId'),
-      		-namespace=>"Navigation"
+      		-namespace=>"Navigation",
+		-label=>$i18n->get(1096),
    		);
 	$tabform->hidden({
 		name=>"returnUrl",
@@ -106,7 +108,6 @@ sub getEditForm {
 			$pedigreeChecked = 1;
 		}
 	}
-	my $i18n = WebGUI::International->new("Asset_Navigation");
 	$tabform->getTab("properties")->selectList(
 		-name=>"startType",
 		-options=>{
diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm
index b78c2611f..810547ebe 100644
--- a/lib/WebGUI/Asset/Wobject/Poll.pm
+++ b/lib/WebGUI/Asset/Wobject/Poll.pm
@@ -172,6 +172,7 @@ sub getEditForm {
    	$tabform->getTab("display")->template(
       		-value=>$self->getValue('templateId'),
       		-namespace=>"Poll"
+		-label=>WebGUI::International::get(73,"Asset_Poll"),
    		);
         my ($i, $answers);
 	for ($i=1; $i<=20; $i++) {
diff --git a/lib/WebGUI/Asset/Wobject/Product.pm b/lib/WebGUI/Asset/Wobject/Product.pm
index 48bd3c8e9..69853f38e 100644
--- a/lib/WebGUI/Asset/Wobject/Product.pm
+++ b/lib/WebGUI/Asset/Wobject/Product.pm
@@ -204,6 +204,7 @@ sub getEditForm {
 	$tabform->getTab("display")->template(
       		-value=>$self->getValue('templateId'),
       		-namespace=>"Product"
+		-label=>WebGUI::International::get(62,"Asset_Product"),
    		);
 	$tabform->getTab("properties")->text(
 		-name=>"price",
diff --git a/lib/WebGUI/Asset/Wobject/SQLReport.pm b/lib/WebGUI/Asset/Wobject/SQLReport.pm
index d3e53ba49..c340314c3 100644
--- a/lib/WebGUI/Asset/Wobject/SQLReport.pm
+++ b/lib/WebGUI/Asset/Wobject/SQLReport.pm
@@ -138,6 +138,7 @@ sub getEditForm {
 	my $tabform = $self->SUPER::getEditForm();
    	$tabform->getTab("display")->template(
       		-value=>$self->getValue('templateId'),
+                -label=>WebGUI::International::get(72,"Asset_SQLReport"),
       		-namespace=>"SQLReport"
    		);
         $tabform->getTab("properties")->yesNo(
diff --git a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
index 0b79f515e..db347fc5c 100644
--- a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
+++ b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
@@ -84,6 +84,7 @@ sub getEditForm {
    	$tabform->getTab("display")->template(
       		-value=>$self->getValue('templateId'),
       		-namespace=>"SyndicatedContent"
+		-label=>WebGUI::International::get(72,"Asset_SyndicatedContent"),
    		);
 	$tabform->getTab("properties")->url(
 		-name=>"rssUrl",
diff --git a/lib/WebGUI/Asset/Wobject/WSClient.pm b/lib/WebGUI/Asset/Wobject/WSClient.pm
index 2f6ed8c57..a9de33cb4 100644
--- a/lib/WebGUI/Asset/Wobject/WSClient.pm
+++ b/lib/WebGUI/Asset/Wobject/WSClient.pm
@@ -157,6 +157,7 @@ sub getEditForm {
       -name      => 'templateId',
       -value     => $self->getValue('templateId'),
       -namespace => "WSClient"
+      -label => WebGUI::International::get(72, "Asset_WSClient"),
    );
    $tabform->getTab("display")->yesNo (
       -name  => 'preprocessMacros',