Index: branches/release-30/lib/MT/App/CMS.pm
===================================================================
--- branches/release-30/lib/MT/App/CMS.pm (revision 1396)
+++ branches/release-30/lib/MT/App/CMS.pm (revision 1397)
@@ -1031,5 +1031,5 @@
         template => {
             templates => {
-                label   => "Templates",
+                label   => "Main Templates",
                 order   => 100,
                 handler => sub {
@@ -1042,19 +1042,19 @@
                 },
             },
-            archive_templates => {
-                label   => "Archive Templates",
-                order   => 200,
-                handler => sub {
-                    my ( $terms, $args ) = @_;
-                    $terms->{type} =
-                      [ 'individual', 'page', 'archive', 'category' ];
-                },
-                condition => sub {
-                    $app->param('blog_id');
-                },
-            },
+            # archive_templates => {
+            #     label   => "Archive Templates",
+            #     order   => 200,
+            #     handler => sub {
+            #         my ( $terms, $args ) = @_;
+            #         $terms->{type} =
+            #           [ 'individual', 'page', 'archive', 'category' ];
+            #     },
+            #     condition => sub {
+            #         $app->param('blog_id');
+            #     },
+            # },
             module_templates => {
-                label   => "Template Modules",
-                order   => 300,
+                label   => "Modules",
+                order   => 400,
                 handler => sub {
                     my ($terms) = @_;
@@ -1064,5 +1064,5 @@
             email_templates => {
                 label   => "E-mail Templates",
-                order   =>  400,
+                order   =>  300,
                 handler => sub {
                     my ($terms) = @_;
@@ -1083,5 +1083,5 @@
             system_templates => {
                 label   => "System Templates",
-                order   => 500,
+                order   => 200,
                 handler => sub {
                     my ($terms) = @_;