diff --git a/mozilla/webtools/litmus/js/ManageSubgroups.js b/mozilla/webtools/litmus/js/ManageSubgroups.js
index 36434fa8d82..5ec9d90c80b 100644
--- a/mozilla/webtools/litmus/js/ManageSubgroups.js
+++ b/mozilla/webtools/litmus/js/ManageSubgroups.js
@@ -230,7 +230,7 @@ function populateAllTestcases() {
       }
     }  
 
-    var optionText = testcases[i].testcase_id + ': ' + testcases[i].summary;
+    var optionText = testcases[i].summary + ' (' + testcases[i].testcase_id + ')';
     selectBoxAll.options[selectBoxAll.length] = new Option(optionText,
                                                            testcases[i].testcase_id);
     
diff --git a/mozilla/webtools/litmus/js/SelectSort.js b/mozilla/webtools/litmus/js/SelectSort.js
index 22158a96908..8d2c426bfd4 100644
--- a/mozilla/webtools/litmus/js/SelectSort.js
+++ b/mozilla/webtools/litmus/js/SelectSort.js
@@ -366,3 +366,14 @@ function copyToList(from,to)
     }
   }
 }
+
+function sortSelect(formName,title,selectID,index,num) {
+  disableForm(formName);
+  rv = toggleMessage('loading','Sorting ' + title + ' list...');
+  rv = confirm("Depending on the number of " + title + ", this can take a little while during which time the browser may be unresponsive. Proceed with sorting?")
+  if (rv) {
+    listSort(selectID,index,num,0);
+  }
+  rv = toggleMessage('none');
+  enableForm(formName);
+}
\ No newline at end of file
diff --git a/mozilla/webtools/litmus/templates/en/default/admin/edit_subgroup.tmpl b/mozilla/webtools/litmus/templates/en/default/admin/edit_subgroup.tmpl
index a960c1d6395..712086a7fc5 100644
--- a/mozilla/webtools/litmus/templates/en/default/admin/edit_subgroup.tmpl
+++ b/mozilla/webtools/litmus/templates/en/default/admin/edit_subgroup.tmpl
@@ -100,11 +100,20 @@
             <td align="center" valign="middle"><input id="move_testcase_up_button" name="move_testcase_up_button" type="button" value="&uArr;" onClick="up('subgroup_testcases');"><br/><br/><input id="move_testcase_down_button" name="move_testcase_down_button" type="button" value="&dArr;" onClick="down('subgroup_testcases');"></td>
             </tr>
             <tr>
-            <td align="right">&uArr;&nbsp;<a name="previewTestcase" onclick="previewTestcase('testcases_for_product');">Preview Testcase</a></td>
+            <td>
+                <table width="100%" border="0" cellpadding="0" cellspacing="0">
+                <tr>
+                    <td align="left">
+                        sort by: <a id="sortByNameHref" name="sortByNameHref" onClick="sortSelect('edit_subgroup_form','testcases','testcases_for_product',0,0)">Name</a>&nbsp;|&nbsp;<a id="sortByIDHref" id="sortByIDHref" onclick="sortSelect('edit_subgroup_form','testcases','testcases_for_product',1,1)">ID</a>
+                    </td>
+                    <td align="right">&uArr;&nbsp;<a name="previewTestcase" onclick="previewTestcase('testcases_for_product');">Preview Testcase</a></td>
+                </tr>
+                </table>
+            </td>
             <td></td>
             <td align="right">&uArr;&nbsp;<a name="previewTestcase" onclick="previewTestcase('subgroup_testcases');">Preview Testcase</a></td> 
             <td></td>
-            </tr>            
+            </tr>
             <tr>
             <td colspan="3" align="right">&uArr;&nbsp;<a name="showManageTestcasesHelp" onclick="toggleHelp(manageTestcasesHelpTitle,manageTestcasesHelpText);">Help with Managing Testcases</a></td>
             <td></td>
diff --git a/mozilla/webtools/litmus/templates/en/default/admin/edit_test_run.tmpl b/mozilla/webtools/litmus/templates/en/default/admin/edit_test_run.tmpl
index 2f3d1a5cc79..37ae956705a 100644
--- a/mozilla/webtools/litmus/templates/en/default/admin/edit_test_run.tmpl
+++ b/mozilla/webtools/litmus/templates/en/default/admin/edit_test_run.tmpl
@@ -174,7 +174,15 @@
             <td align="center" valign="middle"><input id="move_testgroup_up_button" name="move_testgroup_up_button" type="button" value="&uArr;" onClick="up('test_run_testgroups');"><br/><br/><input id="move_testgroup_down_button" name="move_testgroup_down_button" type="button" value="&dArr;" onClick="down('test_run_testgroups');"></td>
             </tr>
             <tr>
-            <td align="right">&uArr;&nbsp;<a name="previewTestgroup" onclick="previewTestgroup('testgroups_for_product');">Preview Testgroup</a></td>
+            <td>
+                <table width="100%" border="0" cellpadding="0" cellspacing="0">
+                <tr>
+                    <td align="left">
+                        sort by: <a id="sortByNameHref" name="sortByNameHref" onClick="sortSelect('edit_test_run_form','testgroups','testgroups_for_product',0,0)">Name</a>&nbsp;|&nbsp;<a id="sortByIDHref" id="sortByIDHref" onclick="sortSelect('edit_test_run_form','testgroups','testgroups_for_product',1,1)">ID</a>                    </td>
+                    <td align="right">&uArr;&nbsp;<a name="previewTestgroup" onclick="previewTestgroup('testgroups_for_product');">Preview Testgroup</a></td>
+                </tr>
+                </table>
+            </td>
             <td></td>
             <td align="right">&uArr;&nbsp;<a name="previewTestgroup" onclick="previewTestgroup('test_run_testgroups');">Preview Testgroup</a></td>
             <td></td>
diff --git a/mozilla/webtools/litmus/templates/en/default/admin/edit_testgroup.tmpl b/mozilla/webtools/litmus/templates/en/default/admin/edit_testgroup.tmpl
index 99f60f1c587..188703bfa52 100644
--- a/mozilla/webtools/litmus/templates/en/default/admin/edit_testgroup.tmpl
+++ b/mozilla/webtools/litmus/templates/en/default/admin/edit_testgroup.tmpl
@@ -93,7 +93,15 @@
             <td align="center" valign="middle"><input id="move_subgroup_up_button" name="move_subgroup_up_button" type="button" value="&uArr;" onClick="up('testgroup_subgroups');"><br/><br/><input id="move_subgroup_down_button" name="move_subgroup_down_button" type="button" value="&dArr;" onClick="down('testgroup_subgroups');"></td>
             </tr>
             <tr>
-            <td align="right">&uArr;&nbsp;<a name="previewSubgroup" onclick="previewSubgroup('subgroups_for_product');">Preview Subgroup</a></td>
+            <td>
+                <table width="100%" border="0" cellpadding="0" cellspacing="0">
+                <tr>
+                    <td align="left">
+                        sort by: <a id="sortByNameHref" name="sortByNameHref" onClick="sortSelect('edit_testgroup_form','subgroups','subgroups_for_product',0,0)">Name</a>&nbsp;|&nbsp;<a id="sortByIDHref" id="sortByIDHref" onclick="sortSelect('edit_testgroup_form','subgroups','subgroups_for_product',1,1)">ID</a>                    </td>
+                    <td align="right">&uArr;&nbsp;<a name="previewSubgroup" onclick="previewSubgroup('subgroups_for_product');">Preview Subgroup</a>
+                </tr>
+                </table>
+            </td>
             <td></td>
             <td align="right">&uArr;&nbsp;<a name="previewSubgroup" onclick="previewSubgroup('testgroup_subgroups');">Preview Subgroup</a></td>
             <td></td>