Index: samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AssessmentSettingsMessages.properties
===================================================================
--- samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AssessmentSettingsMessages.properties	(revision 121411)
+++ samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AssessmentSettingsMessages.properties	(working copy)
@@ -74,9 +74,9 @@
 
 released_to=Assessment Released To
 anonymous_users=Anonymous Users
-selected_groups=Selected Groups
-selected_group=Selected Group(s)
-title_description=Title : Description
+entire_site=Entire Site
+selected_groups=Selected Group(s)
+select_all_groups=Select All Groups
 
 high_security_allow_only_specified_ip=Allow only specified IP Addresses
 high_security_secondary_id_pw=Secondary ID and Password
Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/AssessmentSettingsBean.java
===================================================================
--- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/AssessmentSettingsBean.java	(revision 121411)
+++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/AssessmentSettingsBean.java	(working copy)
@@ -1414,20 +1414,16 @@
     HashMap targets = ptHelper.getTargets();
     Set e = targets.keySet();
     Iterator iter = e.iterator();
-    int numSelections = getNumberOfGroupsForSite() > 0 ? 3 : 2;
+    int numSelections = getNumberOfGroupsForSite() > 0 ? 2 : 1;
    	SelectItem[] target = new SelectItem[numSelections];
+   	ResourceLoader rb = new ResourceLoader("org.sakaiproject.tool.assessment.bundle.AssessmentSettingsMessages");
     while (iter.hasNext()){
 	    String t = (String)iter.next();
-	    if ("Anonymous Users".equals(t)) {
-	  	  ResourceLoader rb = new ResourceLoader("org.sakaiproject.tool.assessment.bundle.AssessmentSettingsMessages");
-	  	  target[0] = new SelectItem(t, rb.getString("anonymous_users"));
+	    if (numSelections == 2 && t.equals(AssessmentAccessControl.RELEASE_TO_SELECTED_GROUPS)) {
+	      target[1] = new SelectItem(t, rb.getString("selected_groups"));
 	    }
-	    else if (numSelections == 3 && t.equals(AssessmentAccessControl.RELEASE_TO_SELECTED_GROUPS)) {
-	  	  ResourceLoader rb = new ResourceLoader("org.sakaiproject.tool.assessment.bundle.AssessmentSettingsMessages");
-	  	  target[2] = new SelectItem(t, rb.getString("selected_groups"));
-	    }
 	    else if (t.equals(AgentFacade.getCurrentSiteName())) {
-	  	  target[1] = new SelectItem(t, t);
+	      target[0] = new SelectItem(t, rb.getString("entire_site"));
 	    }
     }
     return target;
@@ -1655,34 +1651,29 @@
   public SelectItem[] getGroupsForSite(){
       SelectItem[] groupSelectItems = new SelectItem[0];
       TreeMap sortedSelectItems = new TreeMap();
-	  Site site = null;
-	  try {
-		 site = SiteService.getSite(ToolManager.getCurrentPlacement().getContext());
-		 Collection groups = site.getGroups();
-	     if (groups != null && groups.size() > 0) {
-	    	 groupSelectItems = new SelectItem[groups.size()];
-	    	 Iterator groupIter = groups.iterator();
-	    	 while (groupIter.hasNext()) {
-	    		 Group group = (Group) groupIter.next();
-	    		 //String groupType = group.getProperties().getProperty("sections_category");
-	    		 //groupType = groupType == null ? "" : " (" + groupType + ")";
-	    		 String groupDescription = group.getDescription()==null || group.getDescription().equals("") ? "" : " : " + group.getDescription();
-                         String selectDescription = createUniqueKey(groupDescription.toUpperCase(), sortedSelectItems);
-	    		 String displayDescription = group.getTitle() + groupDescription;
-			 sortedSelectItems.put(selectDescription, new SelectItem(group.getId(), displayDescription));
-	    	 }
-	    	 Set keySet = sortedSelectItems.keySet();
-	    	 groupIter = keySet.iterator();
-	    	 int i=0;
-	    	 while (groupIter.hasNext()) {
-	    		 groupSelectItems[i++] = (SelectItem) sortedSelectItems.get(groupIter.next());
-	    	 }
-	     }
-	  }
-	  catch (IdUnusedException ex) {
-		  // No site available
-	  }
-	  return groupSelectItems;
+      Site site = null;
+      try {
+          site = SiteService.getSite(ToolManager.getCurrentPlacement().getContext());
+          Collection groups = site.getGroups();
+          if (groups != null && groups.size() > 0) {
+              groupSelectItems = new SelectItem[groups.size()];
+              Iterator groupIter = groups.iterator();
+              while (groupIter.hasNext()) {
+                  Group group = (Group) groupIter.next();
+                  String title = group.getTitle();
+                  sortedSelectItems.put(title.toUpperCase(), new SelectItem(group.getId(), title));
+              }
+              Set keySet = sortedSelectItems.keySet();
+              groupIter = keySet.iterator();
+              int i = 0;
+              while (groupIter.hasNext()) {
+                  groupSelectItems[i++] = (SelectItem) sortedSelectItems.get(groupIter.next());
+              }
+          }
+      } catch (IdUnusedException ex) {
+          // No site available
+      }
+      return groupSelectItems;
   }
   
   
Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/PublishedAssessmentSettingsBean.java
===================================================================
--- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/PublishedAssessmentSettingsBean.java	(revision 121411)
+++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/PublishedAssessmentSettingsBean.java	(working copy)
@@ -60,6 +60,7 @@
 import org.sakaiproject.tool.api.ToolSession;
 import org.sakaiproject.entity.api.Reference;
 import org.sakaiproject.entity.cover.EntityManager;
+import org.sakaiproject.tool.assessment.data.dao.assessment.AssessmentAccessControl;
 import org.sakaiproject.tool.assessment.data.ifc.assessment.AssessmentAccessControlIfc;
 import org.sakaiproject.tool.assessment.data.ifc.assessment.AssessmentFeedbackIfc;
 import org.sakaiproject.tool.assessment.data.ifc.assessment.AssessmentMetaDataIfc;
@@ -1303,34 +1304,24 @@
   }
 
   public SelectItem[] getPublishingTargets() {
-    HashMap targets = ptHelper.getTargets();
-    Set e = targets.keySet();
-    Iterator iter = e.iterator();
-    // sort the targets
-    String[] titles = new String[targets.size()];
-    while (iter.hasNext()){
-	for (int m = 0; m < e.size(); m++) {
-	    String t = (String)iter.next();
-	    //log.info("target "+m+"="+t);
-	    titles[m] = t;
-	}
-    }
-    Arrays.sort(titles);
-    SelectItem[] target = new SelectItem[targets.size()];
-    for (int i=0; i<titles.length; i++){
-	target[i] = new SelectItem(titles[i]);
-    }
-    /**
-    SelectItem[] target = new SelectItem[targets.size()];
-    while (iter.hasNext()) {
-      for (int i = 0; i < e.size(); i++) {
-        target[i] = new SelectItem( (String) iter.next());
-      }
-    }
-    */
-    return target;
+	  HashMap targets = ptHelper.getTargets();
+	  Set e = targets.keySet();
+	  Iterator iter = e.iterator();
+	  int numSelections = getNumberOfGroupsForSite() > 0 ? 2 : 1;
+	  SelectItem[] target = new SelectItem[numSelections];
+	  ResourceLoader rb = new ResourceLoader("org.sakaiproject.tool.assessment.bundle.AssessmentSettingsMessages");
+	  while (iter.hasNext()){
+	      String t = (String)iter.next();
+	      if (numSelections == 2 && t.equals(AssessmentAccessControl.RELEASE_TO_SELECTED_GROUPS)) {
+	          target[1] = new SelectItem(t, rb.getString("selected_groups"));
+	      } else if (t.equals(AgentFacade.getCurrentSiteName())) {
+	        target[0] = new SelectItem(t, rb.getString("entire_site"));
+	      }
+	  }
+	  return target;
   }
 
+  
   public void setTargetSelected(String[] targetSelected) {
     this.targetSelected = targetSelected;
   }
@@ -1473,22 +1464,15 @@
 				Iterator groupIter = groups.iterator();
 				while (groupIter.hasNext()) {
 					Group group = (Group) groupIter.next();
-					//String groupType = group.getProperties().getProperty("sections_category");
-					//groupType = groupType == null ? "" : " (" + groupType + ")";
-					String groupDescription = group.getDescription() == null
-							|| group.getDescription().equals("") ? "" : " : "
-							+ group.getDescription();
-					String selectDescription = createUniqueKey(groupDescription.toUpperCase(), sortedSelectItems);
-					String displayDescription = group.getTitle()
-							+ groupDescription;
- 					sortedSelectItems.put(selectDescription, new SelectItem(group.getId(), displayDescription));
+					String title = group.getTitle();
+					sortedSelectItems.put(title.toUpperCase(),
+							new SelectItem(group.getId(), title));
 				}
 				Set keySet = sortedSelectItems.keySet();
 				groupIter = keySet.iterator();
 				int i = 0;
 				while (groupIter.hasNext()) {
-					groupSelectItems[i++] = (SelectItem) sortedSelectItems
-							.get(groupIter.next());
+					groupSelectItems[i++] = (SelectItem) sortedSelectItems.get(groupIter.next());
 				}
 			}
 		} catch (IdUnusedException ex) {
Index: samigo-app/src/webapp/jsf/author/authorSettings.jsp
===================================================================
--- samigo-app/src/webapp/jsf/author/authorSettings.jsp	(revision 121411)
+++ samigo-app/src/webapp/jsf/author/authorSettings.jsp	(working copy)
@@ -450,7 +450,7 @@
     <h:selectBooleanCheckbox id="checkUncheckAllReleaseGroups" onclick="checkUncheckAllReleaseGroups();"/>
       
   <f:verbatim></td><td></f:verbatim>
-  <h:outputText value="#{assessmentSettingsMessages.title_description}" />
+  <h:outputText value="#{assessmentSettingsMessages.select_all_groups}" />
   <f:verbatim></td></tr></table></f:verbatim>
   
     <h:selectManyCheckbox id="groupsForSite" layout="pagedirection" value="#{assessmentSettings.groupsAuthorized}">
Index: samigo-app/src/webapp/jsf/author/publishedSettings.jsp
===================================================================
--- samigo-app/src/webapp/jsf/author/publishedSettings.jsp	(revision 121411)
+++ samigo-app/src/webapp/jsf/author/publishedSettings.jsp	(working copy)
@@ -370,7 +370,7 @@
   <f:verbatim><table bgcolor="#CCCCCC"><tr><td></f:verbatim>  
   
   <f:verbatim></td><td></f:verbatim>
-  <h:outputText value="#{assessmentSettingsMessages.title_description}" />
+  <h:outputText value="#{assessmentSettingsMessages.select_all_groups}" />
   <f:verbatim></td></tr></table></f:verbatim>
   
   <h:selectManyCheckbox disabled="true" id="groupsForSite" layout="pagedirection" value="#{publishedSettings.groupsAuthorized}">