diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 7f443da18..d2b760499 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -1,4 +1,6 @@
 6.5.3
+ - Sorted templates into folders named after their respective namespaces
+ - & re-enabled the manage button next to the template dropdown [mwilson]
  - fix [ 1161457 ] Data fomr - list all entries: Logfile Error
  - fix [ 1161461 ] Data form - Add field - wrong destination
  - fix [ 1164382 ] User Profiling WebGUI::International::get(304,"WebGUI");
diff --git a/lib/WebGUI/Asset/Template.pm b/lib/WebGUI/Asset/Template.pm
index 03d5078f7..7f3e378bd 100644
--- a/lib/WebGUI/Asset/Template.pm
+++ b/lib/WebGUI/Asset/Template.pm
@@ -334,6 +334,16 @@ sub www_edit {
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get('edit template', 'Template'));
 }
 
+#-------------------------------------------------------------------
+sub www_manage {
+	my $self = shift;
+	#takes the user to the folder containing this template.
+	return $self->getParent->www_manageAssets;
+}
+
+
+
+
 #-------------------------------------------------------------------
 sub www_view {
 	my $self = shift;
diff --git a/lib/WebGUI/HTMLForm.pm b/lib/WebGUI/HTMLForm.pm
index d05823831..d33ff3a99 100644
--- a/lib/WebGUI/HTMLForm.pm
+++ b/lib/WebGUI/HTMLForm.pm
@@ -2175,7 +2175,7 @@ sub template {
                 		$buttons = editIcon("func=edit",$template->get("url"));
 				#"&namespace=".$namespace."&afterEdit=".WebGUI::URL::escape($afterEdit));
         	#	}
-        		#$buttons .= manageIcon("op=listTemplates&namespace=$namespace");
+        		$buttons .= manageIcon("func=manage",$template->get("url"));
 		}
         	$output = WebGUI::Form::template({
                 	"name"=>$name,