diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index d818b0a84..aa2daedd5 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -2794,10 +2794,8 @@ sub www_edit {
     my $template    = WebGUI::Asset->newById( $session, $session->setting->get('templateIdAssetEdit') );
     $template->setParam( %{ $f->toTemplateVars } );
 
-    return $self->session->style->process(
-        $template->process,
-        "PBtmpl0000000000000137"
-    );
+    $template->style( "PBtmpl0000000000000137" );
+    return $template;
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Asset/RichEdit.pm b/lib/WebGUI/Asset/RichEdit.pm
index 011e149dd..4a2993491 100644
--- a/lib/WebGUI/Asset/RichEdit.pm
+++ b/lib/WebGUI/Asset/RichEdit.pm
@@ -542,23 +542,6 @@ around indexContent => sub {
 };
 
 
-#-------------------------------------------------------------------
-
-=head2 www_edit ( )
-
-Override the method from Asset.pm to change the title of the screen.
-
-=cut
-
-sub www_edit {
-    my $self = shift;
-    return $self->session->privilege->insufficient() unless $self->canEdit;
-    return $self->session->privilege->locked() unless $self->canEditIfLocked;
-	my $i18n = WebGUI::International->new($self->session,"Asset_RichEdit");
-    return $self->getAdminConsole->render($self->getEditForm->print,$i18n->get("rich edit edit config"));
-}
-
-
 __PACKAGE__->meta->make_immutable;
 1;
 
diff --git a/lib/WebGUI/Asset/Template.pm b/lib/WebGUI/Asset/Template.pm
index d4c9b6d79..092b4b8e4 100644
--- a/lib/WebGUI/Asset/Template.pm
+++ b/lib/WebGUI/Asset/Template.pm
@@ -801,7 +801,7 @@ default template.
 
 =cut
 
-sub www_edit {
+override www_edit => sub {
     my $self = shift;
     return $self->session->privilege->insufficient() unless $self->canEdit;
     return $self->session->privilege->locked() unless $self->canEditIfLocked;
@@ -809,7 +809,7 @@ sub www_edit {
     my $form    = $session->form;
     my $url     = $session->url;
     my $i18n    = WebGUI::International->new($session, "Asset_Template");
-    my $output  = '';
+    my $template = super();
 
     # Add an unfriendly warning message if this is a default template
     if ( $self->get( 'isDefault' ) ) {
@@ -821,48 +821,20 @@ sub www_edit {
                 $duplicateUrl = $url->append( $duplicateUrl, "returnUrl=" . $form->get( "returnUrl" ) );
             }
         }
-        
-        $session->style->setRawHeadTags( <<'ENDHTML' );
-<style type="text/css">
-.wGwarning { 
-    border              : 1px solid red;
-    background-color    : #FF6666;
-    padding             : 10px;
-    margin              : 5px;
-    /* TODO: Add a nice little image here */
-    /* TODO: Make this a generic warning class from the default webgui stylesheet */
-}
-</style>
-ENDHTML
 
-        $output .= q{<div class="wGwarning"><p>}
+        my $errors  = $template->getParam('errors') || [];
+        my $message .= q{<p>}
                 . $i18n->get( "warning default template" )
                 . q{</p><p>}
                 . sprintf( q{<a href="} . $duplicateUrl . q{">%s</a>}, $i18n->get( "make duplicate label" ) )
-                . q{</p></div>}
+                . q{</p>}
                 ;
+        push @$errors, $message;
+        $template->setParam( 'errors' => $errors );
     }
-    
-    my $func    = $self->session->form->get('func');
-    my $f   = eval { $self->getEditForm };
-    return $@ if $@;
-    $f->addField( "Hidden", name => "func", value => "editSave" );
-    if ( $func eq 'add' ) {
-        my $className   = $self->session->form->get('className');
-        $f->action( $self->getParent->getUrl );
-        $f->getTab('meta')->getField( 'className' )->set('value', $className);
-    }
-    else {
-        $f->action( $self->getUrl );
-    }
-    $output .= $f->toHtml;
 
-    # TODO: Make a www_edit template
-    return $self->session->style->process(
-        '<div class="yui-skin-sam">' . $output . '</div>',
-        "PBtmpl0000000000000137"
-    );
-}
+    return $template;
+};
 
 #-------------------------------------------------------------------
 
diff --git a/lib/WebGUI/Asset/Wobject/Calendar.pm b/lib/WebGUI/Asset/Wobject/Calendar.pm
index 284c40e3c..36f474987 100644
--- a/lib/WebGUI/Asset/Wobject/Calendar.pm
+++ b/lib/WebGUI/Asset/Wobject/Calendar.pm
@@ -1645,28 +1645,6 @@ sub wrapIcal {
 
 #----------------------------------------------------------------------------
 
-=head2 www_edit ( )
-
-Adds a submenu to the default edit page that includes links to Add an Event.
-
-=cut
-
-sub www_edit {
-    my $self    = shift;
-    my $session = $self->session;
-    my $i18n    = WebGUI::International->new($session, 'Asset_Calendar');
-
-    return $session->privilege->insufficient() unless $self->canEdit;
-
-
-    return $self->getAdminConsole->render(
-            $self->getEditForm->toHtml,
-            $i18n->get("assetName")
-        );
-}
-
-#----------------------------------------------------------------------------
-
 =head2 www_ical
 
 Export an iCalendar feed of this Events Calendar's events.
diff --git a/share/upgrades/7.10.4-8.0.0/root_import_adminconsole_edit-asset.wgpkg b/share/upgrades/7.10.4-8.0.0/root_import_adminconsole_edit-asset.wgpkg
index 0ea83610c..2be8a3268 100644
Binary files a/share/upgrades/7.10.4-8.0.0/root_import_adminconsole_edit-asset.wgpkg and b/share/upgrades/7.10.4-8.0.0/root_import_adminconsole_edit-asset.wgpkg differ
diff --git a/www/extras/css/wg-formbuilder.css b/www/extras/css/wg-formbuilder.css
index ea4bd8c14..ec7ffd646 100644
--- a/www/extras/css/wg-formbuilder.css
+++ b/www/extras/css/wg-formbuilder.css
@@ -9,3 +9,14 @@
     margin-top: 1em;
     font-weight: bold;
 }
+
+.wg-formbuilder .wg-message {
+
+}
+
+.wg-formbuilder .wg-error {
+    border              : 1px solid red;
+    background-color    : #FF6666;
+    padding             : 10px;
+    margin              : 10px;
+}