diff --git a/ui/new/jsp/template.jsp b/ui/new/jsp/template.jsp
index 1c68a5dada0..15f433cc8eb 100644
--- a/ui/new/jsp/template.jsp
+++ b/ui/new/jsp/template.jsp
@@ -35,7 +35,7 @@
                     </ul>
                 </div>
             </div>
-            <div class="grid_editbox">
+            <div class="grid_editbox" id="edit_icon">
             </div>
             <div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
                 display: none;">
@@ -80,6 +80,7 @@
                 <div class="grid_row_cell" style="width: 79%;">
                     <div class="row_celltitles" id="name">
                     </div>
+                    <input class="text" id="name_edit" style="width: 200px; display: none;" type="text" />
                 </div>
             </div>
             <div class="grid_rows odd">
@@ -90,7 +91,7 @@
                 <div class="grid_row_cell" style="width: 79%;">
                     <div class="row_celltitles" id="displaytext">
                     </div>
-                    <input class="text" style="width: 200px; display: none;" type="text" />
+                    <input class="text" id="displaytext_edit" style="width: 200px; display: none;" type="text" />
                 </div>
             </div>
             <div class="grid_rows even">
diff --git a/ui/new/scripts/cloud.core2.template.js b/ui/new/scripts/cloud.core2.template.js
index 48202f74168..36f2bc68a1b 100644
--- a/ui/new/scripts/cloud.core2.template.js
+++ b/ui/new/scripts/cloud.core2.template.js
@@ -1,5 +1,13 @@
-function afterLoadTemplateJSP() {
-
+function afterLoadTemplateJSP() {    
+    $("#edit_icon").bind("click", function(event){        
+        var $rightPanelContent = $("#right_panel_content");
+        $rightPanelContent.find("#name").hide();
+        $rightPanelContent.find("#name_edit").show();
+        $rightPanelContent.find("#displaytext").hide();
+        $rightPanelContent.find("#displaytext_edit").show();
+        $(this).hide();
+        return false;
+    });
 }
 
 function templateToMidmenu(jsonObj, $midmenuItem1) {    
@@ -26,8 +34,12 @@ function templateToRigntPanel($midmenuItem) {
     var $rightPanelContent = $("#right_panel_content");
     $rightPanelContent.find("#id").text(fromdb(jsonObj.id));
     $rightPanelContent.find("#zonename").text(fromdb(jsonObj.zonename));
+    
     $rightPanelContent.find("#name").text(fromdb(jsonObj.name));
+    $rightPanelContent.find("#name_edit").val(fromdb(jsonObj.name));
+    
     $rightPanelContent.find("#displaytext").text(fromdb(jsonObj.displaytext));
+    $rightPanelContent.find("#displaytext_edit").val(fromdb(jsonObj.displaytext));
     
     var status = "Ready";
 	if (jsonObj.isready == "false")