diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 5d6958ce6..86e4bbc74 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -2768,30 +2768,12 @@ sub www_add {
     $f->addField( "Hidden", name => "func", value => "addSave" );
     $f->action( $self->getUrl );
     $f->getTab('meta')->getField( 'className' )->set('value', $class);
-    # TODO: Make this whole thing a template instead!
-    $style->setCss($url->extras('yui/build/button/assets/skins/sam/button.css'));
-    $style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
-    $style->setScript($url->extras('yui/build/element/element-min.js'));
-    $style->setScript($url->extras('yui/build/button/button-min.js'));
-    $style->setRawHeadTags(<<'ENDHTML'); 
-        <style type="text/css">
-            * { font: 12pt Helvetica, sans-serif; }
-            label.formDescription { display: block; margin-top: 1em; font-weight: bold }
-            .saveButtons { position: absolute; top: 3px; right: 5px; z-index: 9001; }
-        </style>
-        <script type="text/javascript">
-            YAHOO.util.Event.onDOMReady( function() {
-                new YAHOO.widget.Button( "saveButton" );
-                new YAHOO.widget.Button( "cancelButton" );
-                new YAHOO.widget.Button( "saveAndReturnButton" );
-                if ( document.getElementById( 'saveAndCommitButton' ) ) {
-                    new YAHOO.widget.Button('saveAndCommitButton');
-                }
-            } );
-        </script>
-ENDHTML
+
+    my $template    = WebGUI::Asset->newById( $session, $session->setting->get('templateIdAssetEdit') );
+    $template->setParam( %{ $f->toTemplateVars } );
+
     return $self->session->style->process(
-        '<div class="yui-skin-sam">' . $f->toHtml . '</div>',
+        $template->process,
         "PBtmpl0000000000000137"
     );
 }
@@ -2940,34 +2922,11 @@ sub www_edit {
     $f->addField( "Hidden", name => "func", value => "editSave" );
     $f->action( $self->getUrl );
 
-    # TODO: Make this whole thing a template instead!
-    $style->setCss($url->extras('yui/build/button/assets/skins/sam/button.css'));
-    $style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
-    $style->setScript($url->extras('yui/build/element/element-min.js'));
-    $style->setScript($url->extras('yui/build/button/button-min.js'));
-    $style->setRawHeadTags(<<'ENDHTML'); 
-        <style type="text/css">
-            * { font: 12pt Helvetica, sans-serif; }
-            label.formDescription { display: block; margin-top: 1em; font-weight: bold }
-            .saveButtons { position: absolute; top: 3px; right: 5px; z-index: 9001; }
-        </style>
-        <script type="text/javascript">
-            YAHOO.util.Event.onDOMReady( function() {
-                new YAHOO.widget.Button( "saveButton" );
-                new YAHOO.widget.Button( "cancelButton" );
-                new YAHOO.widget.Button( "saveAndReturnButton" );
-                if ( document.getElementById( 'saveAndCommitButton' ) ) {
-                    new YAHOO.widget.Button('saveAndCommitButton');
-                }
-            } );
-            if ( window.parent && window.parent.admin ) {
-                window.parent.admin.adminBar.show("assetHelpers");
-            }
-        </script>
-ENDHTML
+    my $template    = WebGUI::Asset->newById( $session, $session->setting->get('templateIdAssetEdit') );
+    $template->setParam( %{ $f->toTemplateVars } );
 
     return $self->session->style->process(
-        '<div class="yui-skin-sam">' . $f->toHtml . '</div>',
+        $template->process,
         "PBtmpl0000000000000137"
     );
 }
diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index 1799d3df6..52ff65289 100644
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -248,6 +248,15 @@ sub definition {
 		namespace=>"AdminConsole",
 		defaultValue=>$setting->get("AdminConsoleTemplate")
 		});
+    push @fields, {
+        tab             => 'ui',
+        fieldType       => 'template',
+        name            => 'templateIdAssetEdit',
+        label           => $i18n->get('templateIdAssetEdit label'),
+        hoverHelp       => $i18n->get('templateIdAssetEdit description'),
+        namespace       => 'Asset/Edit',
+        defaultValue    => $setting->get('templateIdAssetEdit') || "yKl2HX76TSuv42vmprFbXQ",
+    };
     push(@fields, {
         tab             => "ui",
         fieldType       => "yesNo",
diff --git a/share/upgrades/7.10.4-8.0.0/addAssetEditTemplate.pl b/share/upgrades/7.10.4-8.0.0/addAssetEditTemplate.pl
new file mode 100644
index 000000000..cd51c0625
--- /dev/null
+++ b/share/upgrades/7.10.4-8.0.0/addAssetEditTemplate.pl
@@ -0,0 +1,9 @@
+
+use WebGUI::Upgrade::Script;
+
+start_step "Adding Edit Asset Template";
+
+session->setting->set( 'templateIdAssetEdit' => 'yKl2HX76TSuv42vmprFbXQ' );
+
+done;
+
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
new file mode 100644
index 000000000..0ea83610c
Binary files /dev/null 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
new file mode 100644
index 000000000..ea4bd8c14
--- /dev/null
+++ b/www/extras/css/wg-formbuilder.css
@@ -0,0 +1,11 @@
+/**
+ * wg-formbuilder.css
+ * CSS rules for all forms built with WebGUI::FormBuilder
+ */
+
+.wg-formbuilder label.formDescription
+{
+    display: block;
+    margin-top: 1em;
+    font-weight: bold;
+}