diff --git a/sas/SASEnvironment/Files/portal/genPortalMain.xslt b/sas/SASEnvironment/Files/portal/genPortalMain.xslt
index 211eb9e..738c414 100755
--- a/sas/SASEnvironment/Files/portal/genPortalMain.xslt
+++ b/sas/SASEnvironment/Files/portal/genPortalMain.xslt
@@ -474,6 +474,8 @@
 <!-- Template to handle a reference to a stored process (typically in bookmarks) -->
 
 <xsl:template match="ClassifierMap[@TransformRole='StoredProcess']">
+	<xsl:param name="showDescription"/>
+	<xsl:param name="showLocation"/>
 
    <xsl:variable name="stpProgram">
                 <xsl:for-each select="Trees//Tree">
@@ -492,15 +494,25 @@
    </xsl:variable>
 
    <a><xsl:attribute name="href"><xsl:value-of select="$stpURI"/></xsl:attribute><xsl:value-of select="@Name"/></a><br/>
-   <span style="white-space: nowrap;" colspan="13" class="treeDescription">- <xsl:value-of select="@Desc"/></span><br/>
-   <span style="white-space: nowrap;" colspan="13" class="treeDescription">- METASERVER<xsl:value-of select="$stpLocation"/></span>
+
+   <xsl:choose>
+		<xsl:when test="$showDescription = 'true' and @Desc != ''">
+			<span style="white-space: nowrap;" colspan="13" class="treeDescription">- <xsl:value-of select="@Desc"/></span><br/>
+		</xsl:when>
+	</xsl:choose>
+	<xsl:choose>
+		<xsl:when test="$showLocation = 'true' and $stpLocation != ''">
+			 <span style="white-space: nowrap;" colspan="13" class="treeDescription">- METASERVER<xsl:value-of select="$stpLocation"/></span>
+		</xsl:when>
+	</xsl:choose>
 
 </xsl:template>
 
 <!-- Template to handle a reference to a Report (typically in bookmarks)-->
 
 <xsl:template match="Transformation[@TransformRole='Report']">
-
+	<xsl:param name="showDescription"/>
+	<xsl:param name="showLocation"/>
 <!-- Unfortunately, to display a report, you need the entire path to it, thus it is required to navigate the parent tree
      structure.
 -->
@@ -515,7 +527,9 @@
    </xsl:variable>
 
     <xsl:call-template name="reportLink">
-	    <xsl:with-param name="reportSBIPURI" select="$reportSBIPURI"/>
+	   <xsl:with-param name="reportSBIPURI" select="$reportSBIPURI"/>
+      <xsl:with-param name="showDescription" select="$showDescription"/>
+		<xsl:with-param name="showLocation" select="$showLocation"/>
 	</xsl:call-template>
 
 </xsl:template>
@@ -553,17 +567,17 @@
                           In this case, we simply want to make a link to the right tab for this referenced portal page.
                      -->
                      <xsl:choose>
-                         <xsl:when test="name(.)='PSPortalPage'">
+                        <xsl:when test="name(.)='PSPortalPage'">
                             <xsl:call-template name="PortalPageLink">
-								<xsl:with-param name="showDescription" select="$showDescription"/>
-								<xsl:with-param name="showLocation" select="$showLocation"/>
-							</xsl:call-template>
-                         </xsl:when>
-                         <xsl:otherwise>
-         	             <xsl:apply-templates  select=".">
-							<xsl:with-param name="showDescription" select="$showDescription"/>
-							<xsl:with-param name="showLocation" select="$showLocation"/>
-						 </xsl:apply-templates>
+								    <xsl:with-param name="showDescription" select="$showDescription"/>
+								    <xsl:with-param name="showLocation" select="$showLocation"/>
+							      </xsl:call-template>
+                        </xsl:when>
+                        <xsl:otherwise>
+         	               <xsl:apply-templates  select=".">
+							         <xsl:with-param name="showDescription" select="$showDescription"/>
+							         <xsl:with-param name="showLocation" select="$showLocation"/>
+						         </xsl:apply-templates>
                          </xsl:otherwise>
                      </xsl:choose>
 	             </td>
@@ -780,8 +794,9 @@
 </xsl:template>
 
 <xsl:template name="reportLink">
-
-  <xsl:param name = "reportSBIPURI" />
+   <xsl:param name = "reportSBIPURI" />
+   <xsl:param name="showDescription"/>
+	<xsl:param name="showLocation"/>
 
          <tr>
 	        <td class="portletEntry" valign="top" colspan="2">
@@ -792,15 +807,25 @@
 			<xsl:variable name="wrsURI"><xsl:text>/SASWebReportStudio/openRVUrl.do?rsRID=</xsl:text><xsl:value-of select="$wrsProgram"/></xsl:variable>
 
 			<a><xsl:attribute name="href"><xsl:value-of select="$wrsURI"/></xsl:attribute><xsl:value-of select="@Name"/></a><br/>
+
          <xsl:variable name="stpLocation">
             <xsl:for-each select="Trees//Tree">
                            <xsl:sort select="position()" order="descending"/>
                            <xsl:text>/</xsl:text><xsl:value-of select="@Name"/>
             </xsl:for-each>
-         </xsl:variable>
+         </xsl:variable>    
+
+         <xsl:choose>
+	      	<xsl:when test="$showDescription = 'true' and @Desc != ''">
+			      <span style="white-space: nowrap;" colspan="13" class="treeDescription">- <xsl:value-of select="@Desc"/><br/></span>
+		      </xsl:when>
+	      </xsl:choose>
+	      <xsl:choose>
+		      <xsl:when test="$showLocation = 'true' and $stpLocation != ''">
+			      <span style="white-space: nowrap;" colspan="13" class="treeDescription">- METASERVER<xsl:value-of select="$stpLocation"/></span>
+		      </xsl:when>
+	      </xsl:choose>
 
-         <span style="white-space: nowrap;" colspan="13" class="treeDescription">- <xsl:value-of select="@Desc"/><br/></span>
-         <span style="white-space: nowrap;" colspan="13" class="treeDescription">- METASERVER<xsl:value-of select="$stpLocation"/></span>
 
 			<!--
 			<iframe style="overflow: auto;width: 100%" frameborder="0" >
diff --git a/sas/SASEnvironment/Files/portlet/edit.bookmarks.get.xslt b/sas/SASEnvironment/Files/portlet/edit.bookmarks.get.xslt
index 9c2ddfd..0942541 100644
--- a/sas/SASEnvironment/Files/portlet/edit.bookmarks.get.xslt
+++ b/sas/SASEnvironment/Files/portlet/edit.bookmarks.get.xslt
@@ -1,49 +1,4 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<!-- input xml format is the Mod_Request xml format with context information
-     about the request is in the NewMetadata section
--->
-
-<xsl:template match="/">
-
- <xsl:variable name="id" select="/Mod_Request/NewMetadata/Id"/>
-
-<GetMetadata>
- <Metadata>
- <PSPortlet PortletType="" Name="">
-   <xsl:attribute name="Id"><xsl:value-of select="$id"/></xsl:attribute>
- </PSPortlet>
- </Metadata>
- <NS>SAS</NS>
- <Flags>20</Flags>
- <Options>
-                     <Templates>
-                        <PSPortlet Id="" Name="" PortletType="">
-                           <Groups/>
-                           <PropertySets/>
-                           <Trees/>
-                        </PSPortlet>
-                        <Group>
-                           <Members/>
-                        </Group>
-                        <PropertySet Id="" Name="">
-                          <SetProperties/>
-                          <PropertySets/>
-                        </PropertySet>
-                        <Property Id="" Name="" SQLType="" DefaultValue=""/>
-                        <Extension Id="" Name="" Value=""/>
-                        <Document Id="" Name="" URIType="" URI="" TextRole="" TextType=""/>
-                        <Transformation Id="" Name="" TransformRole="">
-                           <Trees/>
-                        </Transformation>
-                        <Tree Id="" Name="">
-                           <ParentTree/>
-                        </Tree>
-                     </Templates>
-                </Options>
-</GetMetadata>
-
-</xsl:template>
-
+    <xsl:include href="SASPortalApp/sas/SASEnvironment/Files/portlet/edit.collection.get.xslt"/>
 </xsl:stylesheet>
 
diff --git a/sas/SASEnvironment/Files/portlet/edit.bookmarks.xslt b/sas/SASEnvironment/Files/portlet/edit.bookmarks.xslt
index 489d6bc..296716b 100644
--- a/sas/SASEnvironment/Files/portlet/edit.bookmarks.xslt
+++ b/sas/SASEnvironment/Files/portlet/edit.bookmarks.xslt
@@ -24,10 +24,25 @@
 
 <xsl:variable name="okButton" select="$localeXml/string[@key='okButton']/text()"/>
 <xsl:variable name="cancelButton" select="$localeXml/string[@key='cancelButton']/text()"/>
+<xsl:variable name="moveUpButton" select="$localeXml/string[@key='moveUpButton']/text()"/>
+<xsl:variable name="moveDownButton" select="$localeXml/string[@key='moveDownButton']/text()"/>
+<xsl:variable name="addItemsButton" select="$localeXml/string[@key='addItemsButton']/text()"/>
+<xsl:variable name="removeButton" select="$localeXml/string[@key='removeButton']/text()"/>
+<xsl:variable name="editButton" select="$localeXml/string[@key='editButton']/text()"/>
 
 <xsl:variable name="portletEditCollectionShowDescriptionLabel" select="$localeXml/string[@key='portletEditCollectionShowDescriptionLabel']/text()"/>
 <xsl:variable name="portletEditCollectionShowLocationLabel" select="$localeXml/string[@key='portletEditCollectionShowLocationLabel']/text()"/>
-
+<xsl:variable name="portletEditCollectionSortLabel" select="$localeXml/string[@key='portletEditCollectionSortLabel']/text()"/>
+<xsl:variable name="portletEditCollectionSortUsePreferencesLabel" select="$localeXml/string[@key='portletEditCollectionSortUsePreferencesLabel']/text()"/>
+<xsl:variable name="portletEditCollectionSortAscendingLabel" select="$localeXml/string[@key='portletEditCollectionSortAscendingLabel']/text()"/>
+<xsl:variable name="portletEditCollectionSortDescendingLabel" select="$localeXml/string[@key='portletEditCollectionSortDescendingLabel']/text()"/>
+<xsl:variable name="portletEditCollectionItemsLabel" select="$localeXml/string[@key='portletEditCollectionItemsLabel']/text()"/>
+
+<xsl:variable name="portletEditCollectionConfirmMessage" select="$localeXml/string[@key='portletEditCollectionConfirmMessage']/text()"/>
+<xsl:variable name="portletEditCollectionTooManySelected" select="$localeXml/string[@key='portletEditCollectionTooManySelected']/text()"/>
+<xsl:variable name="portletEditCollectionNoneSelected" select="$localeXml/string[@key='portletEditCollectionNoneSelected']/text()"/>
+<xsl:variable name="portletEditCollectionNotEditable" select="$localeXml/string[@key='portletEditCollectionNotEditable']/text()"/>
+<xsl:variable name="portletEditCollectionHasChangedMessage" select="$localeXml/string[@key='portletEditCollectionHasChangedMessage']/text()"/>
 
 <!-- Global Variables -->
 
@@ -52,17 +67,25 @@
 
 <xsl:variable name="showDescription" select="$portletObject/PropertySets/PropertySet[@Name='PORTLET_CONFIG_ROOT']/SetProperties/Property[@Name='show-description']/@DefaultValue"/>
 <xsl:variable name="showLocation" select="$portletObject/PropertySets/PropertySet[@Name='PORTLET_CONFIG_ROOT']/SetProperties/Property[@Name='show-location']/@DefaultValue"/>
+<xsl:variable name="packageSortOrder" select="$portletObject/PropertySets/PropertySet[@Name='PORTLET_CONFIG_ROOT']/SetProperties/Property[@Name='ascending-packageSortOrder']/@DefaultValue"/>
 
 <xsl:call-template name="commonFormFunctions"/>
 <xsl:call-template name="thisPageScripts"/>
 
+  <xsl:for-each select="$portletObject/Groups/Group/Members/*">
+
+    <xsl:call-template name="addItemList"/>
 
+  </xsl:for-each>
 
 <div id="mainContentDiv"  style="width: 100%"  class="mainContent">
 
 <!-- Links used in the form -->
 
+<xsl:variable name="addLink">addItem.html</xsl:variable>
+<xsl:variable name="removeLink" select="concat('/SASStoredProcess/do?_program=',$appLocEncoded,'services/deleteItem')"/>
 
+<xsl:variable name="editLink">editItem.html</xsl:variable>
 
 <!-- The form -->
 
@@ -177,6 +200,63 @@
             </td>
         </tr>
 
+        <tr>
+            <td colspan="2"></td>
+            <td colspan="4" class="commonLabel" nowrap="nowrap">&#160;
+            </td>
+        </tr>
+
+        <tr>
+            <td colspan="2"></td>
+
+                <td colspan="4" class="textEntry" nowrap="nowrap">
+                <xsl:value-of select="portletEditCollectionSortLabel"/>
+                    <br/>&#160;
+                         <input type="radio" name="ascendingPackageSortOrder" value="UsePreferences" onclick="document.getElementById('selectedPackageSortOrder').value='UsePreferences';hasChanged=true;" id="ascendingPackageSortOrderUsePreferences">
+                         <xsl:choose> 
+                             <xsl:when test="$packageSortOrder = 'UsePreferences'">
+                                  <xsl:attribute name="checked">checked</xsl:attribute>
+                             </xsl:when>
+                             <xsl:when test="not($packageSortOrder)">
+                                  <xsl:attribute name="checked">checked</xsl:attribute>
+                             </xsl:when>
+                         </xsl:choose>
+                         </input>
+                            <xsl:value-of select="$portletEditCollectionSortUsePreferencesLabel"/>
+                    <br/>&#160;
+                         <input type="radio" name="ascendingPackageSortOrder" value="Ascending" onclick="document.getElementById('selectedPackageSortOrder').value='Ascending';hasChanged=true;" id="ascendingPackageSortOrderAscending">
+                         <xsl:if test="$packageSortOrder = 'Ascending'">
+                              <xsl:attribute name="checked">checked</xsl:attribute>
+                         </xsl:if>
+
+                         </input>
+                            <xsl:value-of select="$portletEditCollectionSortAscendingLabel"/>
+                    <br/>&#160;
+                         <input type="radio" name="ascendingPackageSortOrder" value="Descending" onclick="document.getElementById('selectedPackageSortOrder').value='Descending';hasChanged=true;" id="ascendingPackageSortOrderDescending">
+                         <xsl:if test="$packageSortOrder = 'Descending'">
+                              <xsl:attribute name="checked">checked</xsl:attribute>
+                         </xsl:if>
+
+                         </input>
+                            <xsl:value-of select="$portletEditCollectionSortDescendingLabel"/>
+                    <br/><input type="hidden" name="selectedPackageSortOrder" id="selectedPackageSortOrder">
+                         <!-- Set the default value to match the radio button we checked upon initial page creation -->
+
+                         <xsl:attribute name="value"><xsl:value-of select="$packageSortOrder"/></xsl:attribute>
+
+                         </input>
+                </td>
+
+        <script type="text/javascript">
+          var hiddenVal = document.getElementById("selectedPackageSortOrder").value;
+          var sortOrderRadio = document.getElementById("ascendingPackageSortOrder" + hiddenVal);
+          if (sortOrderRadio != null) {
+             sortOrderRadio.checked = true;
+          }
+        </script>
+
+        </tr>
+
         <tr>
             <td colspan="2"></td>
             <td colspan="4" class="commonLabel" nowrap="nowrap">&#160;
@@ -186,6 +266,140 @@
             <td colspan="6"></td>
         </tr>
 
+        <tr>
+            <td colspan="2"></td>
+            <td class="textEntry" valign="top" nowrap="nowrap">
+                <div id="itemText" style="">
+                      <label for="portletItemSelect">
+                          <xsl:value-of select="$portletEditCollectionItemsLabel"/>
+                      </label>
+                </div>
+            </td>
+            <td>&#160;</td>
+
+            <td>
+            <div id="itemList" style="">
+            <table align="left" cellpadding="0" cellspacing="0" border="0">
+                <tr>
+                    <td rowspan="5" valign="top" class="textEntry">
+                        <select name="portletItemSelect" multiple="multiple" size="6" onchange="selectionChanged('portletItemSelect');" id="portletItemSelect" style="width: 70mm">
+
+                          <xsl:for-each select="$portletObject/Groups/Group/Members/*">
+
+                            <xsl:call-template name="addListBox"/>
+
+                          </xsl:for-each>
+
+                        </select>
+                    </td>
+                    <td></td>
+                    <td valign="middle">
+
+                        <a href="#" onclick='moveRowUp("portletItemSelect"); hasChanged=true; return false;'>
+                        <img id="upImg" border="0"
+                            width="12" height="14"
+                            style="display:none"
+                             >
+                            <xsl:attribute name="src">/<xsl:value-of select="$sasthemeContextRoot"/>/themes/<xsl:value-of select="$sastheme"/>/images/Up.gif</xsl:attribute>
+                            <xsl:attribute name="title"><xsl:value-of select="$moveUpButton"/></xsl:attribute>
+                            <xsl:attribute name="alt"><xsl:value-of select="$moveUpButton"/></xsl:attribute>
+                        </img>
+                        </a>
+                        <img style="display:block" id="upImgPlaceHolder"
+                            width="12" height="14"
+                            valign="middle" border="0" alt=""><xsl:attribute name="src">/<xsl:value-of select="$sasthemeContextRoot"/>/themes/<xsl:value-of select="$sastheme"/>/images/1x1.gif</xsl:attribute></img></td>
+
+                </tr>
+                <tr>
+                    <td></td>
+                    <td valign="middle">
+                        <a href="#" onclick='moveRowDown("portletItemSelect"); hasChanged=true; return false;'>
+                        <img id="downImg" border="0"
+                            width="12" height="14"
+                            style="display:none"
+                             >
+                            <xsl:attribute name="src">/<xsl:value-of select="$sasthemeContextRoot"/>/themes/<xsl:value-of select="$sastheme"/>/images/Down.gif</xsl:attribute>
+                            <xsl:attribute name="title"><xsl:value-of select="$moveDownButton"/></xsl:attribute>
+                            <xsl:attribute name="alt"><xsl:value-of select="$moveDownButton"/></xsl:attribute>
+                        </img>
+                        </a>
+                        <img style="display:block" id="downImgPlaceHolder"
+                            width="12" height="14"
+                            valign="middle" border="0" alt=""><xsl:attribute name="src">/<xsl:value-of select="$sasthemeContextRoot"/>/themes/<xsl:value-of select="$sastheme"/>/images/1x1.gif</xsl:attribute></img></td>
+
+                </tr>
+                <tr>
+                    <td colspan="2">&#160;</td>
+                </tr>
+
+                <tr>
+                    <td />
+                    <td valign="middle">
+                        <a role="button">
+ 
+                        <xsl:attribute name="onclick">if (displayChangedMessage("<xsl:value-of select="$portletEditCollectionHasChangedMessage"/>")) editItem("Bookmarks","portletItemSelect",'<xsl:value-of select="$editLink"/>',noneSelected,tooMany); else return false;</xsl:attribute>
+
+                        <img id="editImg" border="0"
+                            width="12" height="14"
+                            style="display:none">
+                            <xsl:attribute name="src">/<xsl:value-of select="$sasthemeContextRoot"/>/themes/<xsl:value-of select="$sastheme"/>/images/Edit.gif</xsl:attribute>
+                            <xsl:attribute name="title"><xsl:value-of select="$editButton"/></xsl:attribute>
+                            <xsl:attribute name="alt"><xsl:value-of select="$editButton"/></xsl:attribute>
+                        </img>
+                        </a>
+                        <img style="display:block" id="editImgPlaceHolder"
+                            width="12" height="14"
+                            valign="middle" border="0" alt=""><xsl:attribute name="src">/<xsl:value-of select="$sasthemeContextRoot"/>/themes/<xsl:value-of select="$sastheme"/>/images/1x1.gif</xsl:attribute></img></td>
+                    </tr>
+
+                <tr>
+                    <td />
+                    <td valign="middle">
+                        <xsl:variable name="collectionGroupId"><xsl:value-of select="$portletObject/Groups/Group[1]/@Id"/></xsl:variable>
+                        <a role="button">
+                           <xsl:attribute name="onclick">if (displayChangedMessage("<xsl:value-of select="$portletEditCollectionHasChangedMessage"/>")) removeItem("portletItemSelect",'<xsl:value-of select="$collectionGroupId"/>','<xsl:value-of select="$removeLink"/>',noneSelected,tooMany); else return false;</xsl:attribute>
+                        <img id="removeImg" border="0" 
+                            width="12" height="14"
+                            style="display:none">
+
+                            <xsl:attribute name="src">/<xsl:value-of select="$sasthemeContextRoot"/>/themes/<xsl:value-of select="$sastheme"/>/images/Remove.gif</xsl:attribute>
+                            <xsl:attribute name="title"><xsl:value-of select="$removeButton"/></xsl:attribute>
+                            <xsl:attribute name="alt"><xsl:value-of select="$removeButton"/></xsl:attribute>
+                            </img>
+                        </a>
+                        <img style="display:block" id="removeImgPlaceHolder"
+                            width="12" height="14"
+                            valign="middle" border="0" alt=""><xsl:attribute name="src">/<xsl:value-of select="$sasthemeContextRoot"/>/themes/<xsl:value-of select="$sastheme"/>/images/1x1.gif</xsl:attribute></img></td>
+                </tr>
+
+                <tr>
+                    <td colspan="3">
+                        <img border="0" height="6" alt=""><xsl:attribute name="src">/<xsl:value-of select="$sasthemeContextRoot"/>/themes/<xsl:value-of select="$sastheme"/>/images/1x1.gif</xsl:attribute></img></td>
+                </tr>
+                <tr>
+
+                    <!--  We want to add an item to the group associated with this portlet, so pass that information
+                          along 
+                    -->
+                    <xsl:variable name="collectionGroupId"><xsl:value-of select="$portletObject/Groups/Group[1]/@Id"/></xsl:variable>
+                    <td valign="top" align="right">
+                        <input class="button" type="button">
+                        <xsl:attribute name="onclick">if (displayChangedMessage("<xsl:value-of select="$portletEditCollectionHasChangedMessage"/>")) addItem("Collection",'<xsl:value-of select="$collectionGroupId"/>','<xsl:value-of select="$parentTreeId"/>',"portletItemSelect",'<xsl:value-of select="$addLink"/>'); else return false;</xsl:attribute>
+                         <xsl:attribute name="value"><xsl:value-of select="$addItemsButton"/></xsl:attribute>
+                         </input>
+                    </td>
+                    <td colspan="2" />
+                </tr>
+
+            </table>
+            </div>
+            </td>
+            <td width="100%">&#160;</td>
+        </tr>
+        <tr>
+            <td colspan="6"><img border="0" height="30" alt=""><xsl:attribute name="src">/<xsl:value-of select="$sasthemeContextRoot"/>/themes/<xsl:value-of select="$sastheme"/>/images/1x1.gif</xsl:attribute></img></td>
+        </tr>
+
         <tr>
             <td colspan="6" class="wizardMessageFooter" height="1"></td>
         </tr>
@@ -230,14 +444,130 @@
 
 </xsl:template>
 
+<xsl:template name="addItemList">
+
+    <!-- The list of members of the collection contains a link bank to the collection psportlet itself, ignore that one -->
+
+    <xsl:variable name="itemType" select="name(.)"/>
+<xsl:message>addItemList: itemType=<xsl:value-of select="$itemType"/></xsl:message>
+    <xsl:if test="$itemType != 'PSPortlet'">
+
+        <xsl:variable name="itemName" select="@Name"/>
+        <xsl:variable name="itemId" select="@Id"/>
+        <xsl:variable name="itemLinkType">
+           <xsl:choose>
+             <xsl:when test="@TextRole='Portal Web Application'">WebApplication</xsl:when>
+             <xsl:when test="@TextRole='Portal Link'">Link</xsl:when>
+             <xsl:when test="@TextRole='Syndication Channel'">ContentChannel</xsl:when>
+           </xsl:choose>
+        </xsl:variable>
+<!-- This was the format of the item key in the existing portal.  However, this has issues being passed as a parameter to 
+     a Stored Process since it has special characters in it that are stripped for security reasons
+
+        <xsl:variable name="itemKey"><xsl:value-of select="$itemLinkType"/>%2Bomi%3A%2F%2F<xsl:value-of select="$reposName"/>%2Freposname%3D<xsl:value-of select="$reposName"/>%2F<xsl:value-of select="$itemType"/>%3Bid%3D<xsl:value-of select="$itemId"/></xsl:variable>
+-->
+
+        <xsl:variable name="itemKey"><xsl:value-of select="$itemLinkType"/>/<xsl:value-of select="$reposName"/>/<xsl:value-of select="$itemType"/>/<xsl:value-of select="$itemId"/></xsl:variable>
+        
+        <script language="javascript" type="">
+             itemDataList[itemCount] = new Object();
+             itemDataList[itemCount].name = "<xsl:value-of select="$itemName"/>";
+             itemDataList[itemCount].entityKey = "<xsl:value-of select="$itemKey"/>";
+
+        <xsl:choose>
+           <xsl:when test="lower-case($itemType)='document'">
+             itemDataList[itemCount].canEdit = true;
+           </xsl:when>
+           <xsl:otherwise>
+             itemDataList[itemCount].canEdit = false;
+           </xsl:otherwise>
+       </xsl:choose>
+             itemCount++;
+
+          </script>
+
+        </xsl:if>
+
+
+</xsl:template>
+
+<xsl:template name="addListBox">
+
+    <!-- The list of members of the collection contains a link bank to the collection psportlet itself, ignore that one -->
+
+    <xsl:variable name="itemType" select="name(.)"/>
+
+    <xsl:if test="$itemType != 'PSPortlet'">
+
+        <xsl:variable name="itemName" select="@Name"/>
+        <xsl:variable name="itemId" select="@Id"/>
+        <xsl:variable name="itemLinkType">
+           <xsl:choose>
+             <xsl:when test="@TextRole='Portal Web Application'">WebApplication</xsl:when>
+             <xsl:when test="@TextRole='Portal Link'">Link</xsl:when>
+             <xsl:when test="@TextRole='Syndication Channel'">ContentChannel</xsl:when>
+           </xsl:choose>
+        </xsl:variable>
+<!-- This was the format of the item key in the existing portal.  However, this has issues being passed as a parameter to
+     a Stored Process since it has special characters in it that are stripped for security reasons
+
+        <xsl:variable name="itemKey"><xsl:value-of select="$itemLinkType"/>%2Bomi%3A%2F%2F<xsl:value-of select="$reposName"/>%2Freposname%3D<xsl:value-of select="$reposName"/>%2F<xsl:value-of select="$itemType"/>%3Bid%3D<xsl:value-of select="$itemId"/></xsl:variable>
+-->
+
+        <xsl:variable name="itemKey"><xsl:value-of select="$itemLinkType"/>/<xsl:value-of select="$reposName"/>/<xsl:value-of select="$itemType"/>/<xsl:value-of select="$itemId"/></xsl:variable>
+
+       <option><xsl:attribute name="value"><xsl:value-of select="$itemKey"/></xsl:attribute>
+       <xsl:value-of select="$itemName"/>
+       </option>
+
+       </xsl:if>
+</xsl:template>
 
 <xsl:template name="thisPageScripts">
 
 <script>
-
+    var confirmMessage = "<xsl:value-of select="$portletEditCollectionConfirmMessage"/>";
+    var tooMany = "<xsl:value-of select="$portletEditCollectionTooManySelected"/>";
+    var noneSelected = "<xsl:value-of select="$portletEditCollectionNoneSelected"/>";
+    var notEdit = "<xsl:value-of select="$portletEditCollectionNotEditable"/>";
 
     var hasChanged = false;
 
+    var itemDataList = new Array();
+    var itemCount = 0;
+
+    /*
+     *  Some of the pages that are linked off to from this page, muck with the
+     *  history, so we need to make sure we get the correct depth to go back
+     */
+
+    var backDepth=-1;
+
+    function addReloadHandler(iframe) {
+
+         iframe.addEventListener( "load", function(e) {
+
+         /*
+          * Since we removed an item from the list, refresh the screen.
+          */
+         location.reload();
+
+        } );
+
+       }
+
+    /*
+     *  The call to remove an item will target a div called removeResponse.
+     *  When it is populated, refresh the page to pick up the change.
+     */
+
+    var removeResponse = document.getElementsByName('removeResponse')[0];
+    if (removeResponse) {
+
+        addReloadHandler(removeResponse);
+
+        }
+
     /*
      *  This event listener is to catch when the page is returned
      *  to via some sort of "back" navigation.
@@ -267,6 +597,108 @@
         }
     });
 
+    function selectFirstRow(selectBoxName) {
+        var selectBox = document.getElementById(selectBoxName);
+        if (selectBox.length <xsl:text disable-output-escaping="yes">&gt;</xsl:text> 0) {
+            selectBox.selectedIndex = 0;
+        }
+        selectionChanged(selectBoxName);
+    }
+
+    function selectionChanged(selectBoxName) {
+        var selectBox = document.getElementById(selectBoxName);
+        var selectedRow = selectBox.selectedIndex;
+
+        var upEnabled = false;
+        var downEnabled = false;
+        var editEnabled = false;
+        var removeEnabled = false;
+
+        if (selectedRow <xsl:text disable-output-escaping="yes">&gt;</xsl:text>= 0) {
+            // Determine basic rules for action icons
+            if (selectedRow != 0) {
+                upEnabled = true;
+            }
+            if (selectedRow != (itemDataList.length-1)) {
+                downEnabled = true;
+            }
+
+
+            editEnabled = itemDataList[selectedRow].canEdit;
+
+            removeEnabled = true;
+        }
+
+        // Show/hide the action icons
+        toggleVisible("upImg", upEnabled);
+        toggleVisible("downImg", downEnabled);
+        toggleVisible("editImg", editEnabled);
+        toggleVisible("removeImg", removeEnabled);
+
+    }
+
+    function toggleVisible(ctrlName, isVisible) {
+
+        var ctrl = document.getElementById(ctrlName);
+        var placeHolder = document.getElementById(ctrlName+"PlaceHolder");
+        if (isVisible) {
+            ctrl.style.display = "block";
+            placeHolder.style.display = "none";
+        } else {
+            ctrl.style.display = "none";
+            placeHolder.style.display = "block";
+        }
+    }
+    function moveRowUp(selectBoxName) {
+        var selectBox = document.getElementById(selectBoxName);
+        var selectedRow = selectBox.selectedIndex;
+
+        if (selectedRow <xsl:text disable-output-escaping="yes">&gt;</xsl:text> 0) {
+            swapListRow(itemDataList, selectedRow-1, selectedRow);
+            changeOrder(selectBoxName, true);
+            selectionChanged(selectBoxName);
+        }
+    }
+
+    function moveRowDown(selectBoxName) {
+        var selectBox = document.getElementById(selectBoxName);
+        var selectedRow = selectBox.selectedIndex;
+
+        if (selectedRow <xsl:text disable-output-escaping="yes">&lt;</xsl:text> (itemDataList.length - 1)) {
+            swapListRow(itemDataList, selectedRow+1, selectedRow);
+            changeOrder(selectBoxName, false);
+            selectionChanged(selectBoxName);
+        }
+    }
+
+    function removeRow(selectBoxName, confirmMessage) {
+        var selectBox = document.getElementById(selectBoxName);
+        var selectedRow = selectBox.selectedIndex;
+
+        deleteOption(selectBoxName, confirmMessage);
+        if (parent.isPageChanged) {
+            itemDataList.splice(selectedRow, 1);
+
+            // If there is any more data
+            if (itemDataList.length <xsl:text disable-output-escaping="yes">&gt;</xsl:text> 0) {
+                // If the selection is beyond the end of the list
+                if (selectedRow <xsl:text disable-output-escaping="yes">&gt;</xsl:text>= itemDataList.length) {
+                    selectedRow = itemDataList.length - 1;
+                }
+
+                // Select the new row
+                selectBox.selectedIndex = selectedRow;
+            }
+
+            selectionChanged(selectBoxName);
+        }
+    }
+
+    function swapListRow(listData, index1, index2) {
+        var temp = listData[index1];
+        listData[index1] = listData[index2];
+        listData[index2] = temp;
+    }
 
     function setBooleanHidden(fldName) {
         var checkboxField = document.getElementById(fldName);
@@ -278,6 +710,279 @@
         }
     }
 
+    //
+    // Sets the correct URL for adding an item.
+    //
+    function addItem(portletType, groupId, parentTreeId, selectBoxName, addUrl)
+    {
+
+      var selectBox = document.getElementById(selectBoxName);
+      addItemParms="portletType=";
+      addItemParms=addItemParms.concat(portletType,'<xsl:text disable-output-escaping="yes">&amp;</xsl:text>type=Document','<xsl:text disable-output-escaping="yes">&amp;</xsl:text>relatedId=',groupId,'<xsl:text disable-output-escaping="yes">&amp;</xsl:text>relatedType=Group','<xsl:text disable-output-escaping="yes">&amp;</xsl:text>parentTreeId=',parentTreeId);
+ 
+
+      if (addUrl.includes('?')) {
+         addUrl=addUrl.concat('<xsl:text disable-output-escaping="yes">&amp;</xsl:text>',addItemParms);
+         }
+
+      else {
+         addUrl=addUrl.concat('?',addItemParms);
+         }
+
+      submitDisableAllForms();
+      location.href=addUrl;
+    }
+
+    //
+    // Sets the correct URL for editing an item.
+    //
+    function editItem(portletType, selectBoxName, editUrl, nothingselected, toomanyselected)
+    {
+
+      var selectBox = document.getElementById(selectBoxName);
+      var i= 0;
+      if (selectBox.options.length <xsl:text disable-output-escaping="yes">&gt;</xsl:text> 0)
+      {
+          for (var j = 0; j <xsl:text disable-output-escaping="yes">&lt;</xsl:text> selectBox.options.length; j++)
+          {
+              if (selectBox.options[j].selected)
+             i++;
+           }
+       }
+
+       if (i <xsl:text disable-output-escaping="yes">&gt;</xsl:text> 1)
+       {
+           alert(""+toomanyselected);
+       }
+       else
+       {
+           srcIndex = selectBox.selectedIndex;
+           if (srcIndex <xsl:text disable-output-escaping="yes">&gt;</xsl:text>= 0)
+           {
+            
+              var selectedValue=selectBox.options[srcIndex].value; 
+              //
+              //  The syntax of the item Value is:
+              //  link type/repository name/item type/item id
+              //
+              //  In this case, we just need the item type and item id, so get those now.
+              //
+             const keyArray = selectedValue.split("/");
+             let itemType = keyArray[2];
+             let itemId = keyArray[3];
+             editItemParms="portletType=";
+             editItemParms=editItemParms.concat(portletType,'<xsl:text disable-output-escaping="yes">&amp;</xsl:text>type=',itemType,'<xsl:text disable-output-escaping="yes">&amp;</xsl:text>id=',itemId);
+
+             if (editUrl.includes('?')) {
+                  editUrl=editUrl.concat('<xsl:text disable-output-escaping="yes">&amp;</xsl:text>',editItemParms);
+                  }
+
+              else {
+                  editUrl=editUrl.concat('?',editItemParms);
+           }
+ 
+              submitDisableAllForms();
+              location.href=editUrl;
+
+           }
+           else
+               alert(""+nothingselected);
+        }
+    }
+
+    //
+    // Sets the correct URL for removing an item.
+    //
+    function removeItem(selectBoxName, groupId, removeUrl, nothingselected, toomanyselected)
+    {
+      var selectBox = document.getElementById(selectBoxName);
+      var i= 0;
+      if (selectBox.options.length <xsl:text disable-output-escaping="yes">&gt;</xsl:text> 0)
+      {
+          for (var j = 0; j <xsl:text disable-output-escaping="yes">&lt;</xsl:text> selectBox.options.length; j++)
+          {
+              if (selectBox.options[j].selected)
+             i++;
+           }
+       }
+
+       if (i <xsl:text disable-output-escaping="yes">&gt;</xsl:text> 1)
+       {
+           alert(""+toomanyselected);
+       }
+       else
+       {
+           srcIndex = selectBox.selectedIndex;
+           if (srcIndex <xsl:text disable-output-escaping="yes">&gt;</xsl:text>= 0)
+           {
+            
+              var selectedValue=selectBox.options[srcIndex].value; 
+              var retValue=confirm(confirmMessage);
+
+              if (retValue) {
+                  pageChanged(false);
+
+                  //
+                  //  The syntax of the item Value is:
+                  //  link type/repository name/item type/item id
+                  //
+                  //  In this case, we just need the item type and item id, so get those now.
+                  //
+                 const keyArray = selectedValue.split("/");
+                 let itemType = keyArray[2];
+                 let itemId = keyArray[3];
+                 removeItemParms="Type=";
+                 removeItemParms=removeItemParms.concat(itemType,'<xsl:text disable-output-escaping="yes">&amp;</xsl:text>id=',itemId,'<xsl:text disable-output-escaping="yes">&amp;</xsl:text>relatedId=',groupId,'<xsl:text disable-output-escaping="yes">&amp;</xsl:text>relatedType=Group','<xsl:text disable-output-escaping="yes">&amp;</xsl:text>parentTreeId=','<xsl:value-of select="$parentTreeId"/>');
+
+                 if (removeUrl.includes('?')) {
+                      removeUrl=removeUrl.concat('<xsl:text disable-output-escaping="yes">&amp;</xsl:text>',removeItemParms);
+                      }
+
+                  else {
+                      removeUrl=removeUrl.concat('?',removeItemParms);
+                      }
+     
+                  submitDisableAllForms();
+                  // backDepth=-2;
+
+                  removeResponse.contentWindow.location.replace(removeUrl);
+              
+                  }
+             else {
+                return retValue;
+                } 
+           }
+           else
+               alert(""+nothingselected);
+        }
+    }
+    //
+    // Select or values in a select list
+    //
+    function selectAllOptions(selBox)
+    {
+        if (selBox != null <xsl:text disable-output-escaping="yes">&amp;&amp;</xsl:text> selBox.options.length <xsl:text disable-output-escaping="yes">&gt;</xsl:text> 0)
+        {
+            for (var j = 0; j <xsl:text disable-output-escaping="yes">&lt;</xsl:text> selBox.options.length; j++)
+            {
+                selBox.options[j].selected = true;
+            }
+        }
+    }
+
+    function selectAllItems(name)
+    {
+         selBox = document.getElementById(name);
+         selectAllOptions(selBox);
+         window.location.href = sasPortalAppHome;
+    }
+
+    //
+    // UnSelect all values in a select list
+    //
+    function unSelectAllOptions(selBox)
+    {
+        if (selBox != null <xsl:text disable-output-escaping="yes">&amp;&amp;</xsl:text> selBox.options.length <xsl:text disable-output-escaping="yes">&gt;</xsl:text> 0)
+        {
+            for (var j = 0; j <xsl:text disable-output-escaping="yes">&lt;</xsl:text> selBox.options.length; j++)
+            {
+                selBox.options[j].selected = false;
+            }
+        }
+    }
+    //
+    // Rearrange the items in a SELECT LIST by moving it up or down
+    //
+    function changeOrder(selectBoxName, moveUp)
+    {
+      var selectBox = document.getElementById(selectBoxName);
+      var srcText = srcValue = destText = destValue = "";
+      var srcIndex = destIndex = 0;
+      srcIndex = selectBox.selectedIndex;
+
+       if (srcIndex <xsl:text disable-output-escaping="yes">&gt;</xsl:text>= 0)
+       {
+           pageChanged(true);
+
+           switch (moveUp)
+          {
+               case false:
+                  increment = 1
+                  if (srcIndex +1 == selectBox.length)
+                     return;
+                  destIndex = srcIndex + increment;
+                  break;
+             case true:
+                increment = -1
+                if (srcIndex <xsl:text disable-output-escaping="yes">&lt;</xsl:text> 1) return;
+                    destIndex = srcIndex + increment;
+                break;
+           }
+
+          with (selectBox)
+          {
+            srcText  = options[srcIndex].text;
+            srcValue = options[srcIndex].value;
+
+            destText  = options[destIndex].text;
+            destValue = options[destIndex].value;
+
+            options[destIndex].text = srcText;
+            options[destIndex].value = srcValue;
+
+            options[srcIndex].text = destText;
+            options[srcIndex].value = destValue;
+
+            selectedIndex = destIndex;
+           }
+       }
+       else
+           pageChanged(false);
+
+
+    }
+
+    // call this function when a from field changed when Editing a Page, or when Saving or Cancelling
+    function pageChanged(isChanged)
+    {
+        parent.isPageChanged = isChanged;
+     
+        /*
+         *  Set the value in the input form to pass back to the server.
+         *  This routine is called many times, sometimes with false after it had been called with true.
+         *  For what we want to pass to the server, once the list is modified in any way, it shouldn't
+         *  go back to false.
+         */
+        var listChangedInput = document.querySelector("input[name='listChanged']");
+
+        if (isChanged) {
+           listChangedInput.value=isChanged;
+           }
+
+    }
+
+    //
+    // Delete an item from a SELECT LIST.
+    //
+    function deleteOption(selectBoxName, removeConfirmMsg)
+    {
+      var retval = confirm(removeConfirmMsg);
+      if (!retval) {
+         pageChanged (false);
+      } else {
+         var selectBox = document.getElementById(selectBoxName);
+         if (selectBox != null <xsl:text disable-output-escaping="yes">&amp;&amp;</xsl:text> selectBox.options.length <xsl:text disable-output-escaping="yes">&gt;</xsl:text> 0) {
+             for (var i = 0; i <xsl:text disable-output-escaping="yes">&lt;</xsl:text> selectBox.length; i++) {
+                 if (selectBox.options[i].selected) {
+                     selectBox.options[i]=null;
+                     pageChanged(true);
+                     i--;
+                 }
+             }
+         }
+      }
+      return retval;
+    }
 
 </script>
 
diff --git a/sas/SASEnvironment/Files/portlet/edit.collection.xslt b/sas/SASEnvironment/Files/portlet/edit.collection.xslt
index 3449d2f..3323d6c 100755
--- a/sas/SASEnvironment/Files/portlet/edit.collection.xslt
+++ b/sas/SASEnvironment/Files/portlet/edit.collection.xslt
@@ -874,6 +874,7 @@
     {
          selBox = document.getElementById(name);
          selectAllOptions(selBox);
+         window.location.href = sasPortalAppHome;
     }
 
     //
diff --git a/sas/SASEnvironment/Files/portlet/update.bookmarks.get.xslt b/sas/SASEnvironment/Files/portlet/update.bookmarks.get.xslt
index 82ee7e9..8ea5bd0 100644
--- a/sas/SASEnvironment/Files/portlet/update.bookmarks.get.xslt
+++ b/sas/SASEnvironment/Files/portlet/update.bookmarks.get.xslt
@@ -1,51 +1,3 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<!-- input xml format is the Mod_Request xml format with context information
-     about the request is in the NewMetadata section
--->
-
-<xsl:template match="/">
-
- <xsl:variable name="id" select="/Mod_Request/NewMetadata/Id"/>
-
-<GetMetadata>
- <Metadata>
- <PSPortlet PortletType="" Name="">
-   <xsl:attribute name="Id"><xsl:value-of select="$id"/></xsl:attribute>
- </PSPortlet>
- </Metadata>
- <NS>SAS</NS>
- <Flags>20</Flags>
- <Options>
-                     <Templates>
-                        <PSPortlet Id="" Name="" PortletType="">
-                           <Groups/>
-                           <PropertySets/>
-                           <Trees/>
-                           <Keywords/>
-                        </PSPortlet>
-                        <Group>
-                           <Members/>
-                        </Group>
-                        <PropertySet Id="" Name="">
-                          <SetProperties/>
-                          <PropertySets/>
-                        </PropertySet>
-                        <Property Id="" Name="" SQLType="" DefaultValue=""/>
-                        <Extension Id="" Name="" Value=""/>
-                        <Document Id="" Name="" URIType="" URI="" TextRole="" TextType=""/>
-                        <Transformation Id="" Name="" TransformRole="">
-                           <Trees/>
-                        </Transformation>
-                        <Tree Id="" Name="">
-                           <ParentTree/>
-                        </Tree>
-                        <Keyword Id="" Name=""/>
-                     </Templates>
-                </Options>
-</GetMetadata>
-
-</xsl:template>
-
-</xsl:stylesheet>
-
+   <xsl:include href="SASPortalApp/sas/SASEnvironment/Files/portlet/update.collection.get.xslt"/>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/sas/SASEnvironment/Files/portlet/update.bookmarks.xslt b/sas/SASEnvironment/Files/portlet/update.bookmarks.xslt
index c6e1488..b4c08e9 100644
--- a/sas/SASEnvironment/Files/portlet/update.bookmarks.xslt
+++ b/sas/SASEnvironment/Files/portlet/update.bookmarks.xslt
@@ -64,9 +64,39 @@
 
 </xsl:variable>
 
+<!-- Package Sort Order Property -->
+
+<xsl:variable name="newPackageSortOrderId"><xsl:value-of select="substring-after($reposId,'.')"/>.$newPackageSortOrder</xsl:variable>
+<xsl:variable name="oldPackageSortOrderId">
+ <xsl:choose>
+   <xsl:when test="$configProperties/Property[@Name='ascending-packageSortOrder']/@Id">
+      <xsl:value-of select="$configProperties/Property[@Name='ascending-packageSortOrder']/@Id"/>
+   </xsl:when>
+   <xsl:otherwise>
+    <xsl:value-of select="$newPackageSortOrderId"/>
+   </xsl:otherwise>
+  </xsl:choose>
+</xsl:variable>
+<xsl:variable name="oldPackageSortOrder" select="$configProperties/Property[@Name='ascending-packageSortOrder']/@DefaultValue"/>
+
+<xsl:variable name="newPackageSortOrder">
+
+  <xsl:choose>
+     <xsl:when test="Mod_Request/NewMetadata/PackageSortOrder = 'UsePreferences'">UsePreferences</xsl:when>
+     <xsl:when test="Mod_Request/NewMetadata/PackageSortOrder = 'Ascending'">Ascending</xsl:when>
+     <xsl:when test="Mod_Request/NewMetadata/PackageSortOrder = 'Descending'">Descending</xsl:when>
+     <xsl:otherwise><xsl:value-of select="$oldPackageSortOrder"/></xsl:otherwise>
+  </xsl:choose>
+
+</xsl:variable>
+
+<xsl:variable name="listChanged"><xsl:value-of select="Mod_Request/NewMetadata/ListChanged"/></xsl:variable>
+
+<!-- See if we have anything to update -->
+
 <xsl:choose>
 
-<xsl:when test="not($newShowDescription=$oldShowDescription) or not($newShowLocation=$oldShowLocation) or $commonPropertiesChanged">
+<xsl:when test="not($newShowDescription=$oldShowDescription) or not($newShowLocation=$oldShowLocation) or not($newPackageSortOrder=$oldPackageSortOrder) or ($listChanged='true') or $commonPropertiesChanged">
 
     <Multiple_Requests>
 
@@ -125,6 +155,53 @@
             </Property>
         </xsl:if>
         
+        <xsl:if test="not($newPackageSortOrder=$oldPackageSortOrder)">
+            <Property>
+               <xsl:attribute name="Id"><xsl:value-of select="$oldPackageSortOrderId"/></xsl:attribute>
+               <xsl:attribute name="DefaultValue"><xsl:value-of select="$newPackageSortOrder"/></xsl:attribute>
+               <!-- If the old id is not the same as the new id, then we already had the object, so no further
+                    metadata is required.  If they are the same, then we need to fill in the rest of the information
+                    about this property -->
+
+               <xsl:if test="$oldPackageSortOrderId=$newPackageSortOrderId">
+                   <xsl:attribute name="Name">ascending-packageSortOrder</xsl:attribute>
+                   <xsl:attribute name="SQLType">12</xsl:attribute>
+
+                   <AssociatedPropertySet> 
+                      <PropertySet>
+                        <xsl:attribute name="ObjRef"><xsl:value-of select="$configPropertySetId"/></xsl:attribute>
+                      </PropertySet>
+                   </AssociatedPropertySet>
+
+               </xsl:if>
+            </Property>
+        </xsl:if>
+
+        <xsl:if test="$listChanged = 'true'">
+            <!--  The group list has as it's first item a link back to the portlet itself, followed
+                  by the list of items.  In this case, we know the list has changed, but we don't
+                  know the extent.  Thus, we will just replace the current list with a new list.
+             -->
+             <xsl:variable name="collectionGroupId" select="$portletObject/Groups/Group/@Id"/>
+             <Group><xsl:attribute name="Id"><xsl:value-of select="$collectionGroupId"/></xsl:attribute>
+                <Members function="replace">
+                    <PSPortlet><xsl:attribute name="ObjRef"><xsl:value-of select="$portletId"/></xsl:attribute></PSPortlet>
+                    <xsl:for-each select="Mod_Request/NewMetadata/Items/*">
+                      <!-- The format of each item in the list is defined as 
+                           <linkType>/<repository>/<objectType>/<objectId>
+                           all we need here is the <objectType> and </objectId>
+                      -->
+                      <xsl:variable name="listItemId"><xsl:value-of select="tokenize(., '/')[last()]"/></xsl:variable>
+                      <xsl:variable name="listItemType"><xsl:value-of select="tokenize(.,'/')[3]"/></xsl:variable> 
+                      <xsl:element name="{$listItemType}"><xsl:attribute name="ObjRef"><xsl:value-of select="$listItemId"/></xsl:attribute></xsl:element>
+                    </xsl:for-each>
+
+                </Members>
+
+             </Group>
+
+        </xsl:if>
+
       </Metadata>
 
       <NS>SAS</NS>
diff --git a/sas/SASEnvironment/SASCode/Steps/portlet/update.bookmarks.parameters.sas b/sas/SASEnvironment/SASCode/Steps/portlet/update.bookmarks.parameters.sas
index 03725ab..32e2a68 100644
--- a/sas/SASEnvironment/SASCode/Steps/portlet/update.bookmarks.parameters.sas
+++ b/sas/SASEnvironment/SASCode/Steps/portlet/update.bookmarks.parameters.sas
@@ -1,33 +1 @@
-%macro genItems;
-
-  %if (%symexist(PORTLETITEMSELECT_COUNT)) %then %do;
-      %if (&PORTLETITEMSELECT_COUNT. > 1) %then %do;
-
-          %do i=1 %to &PORTLETITEMSELECT_COUNT;
-              put "<Item>%superq(PORTLETITEMSELECT&i.)</Item>";
-          %end;
-      %end;
-      %else %do;
-          %if (&PORTLETITEMSELECT_COUNT. = 1) %then %do;
-
-              put "<Item>%superq(PORTLETITEMSELECT)</Item>";
-          %end;
-        %end;
-      %end;
-
-%mend;
-
-     %if (%symexist(selectedShowDescription)) %then %do;
-        put "<ShowDescription>&selectedShowDescription.</ShowDescription>";
-        %end;
-     %if (%symexist(selectedShowLocation)) %then %do;
-        put "<ShowLocation>&selectedShowLocation.</ShowLocation>";
-        %end;
-
-
-     put '<Items>';
-
-     %genItems;
-
-     put '</Items>';
-
+%inc "&SYSINCLUDEFILEDIR/update.collection.parameters.sas" / source2;
diff --git a/web/setup.js.template b/web/setup.js.template
index fe072cf..5548b19 100644
--- a/web/setup.js.template
+++ b/web/setup.js.template
@@ -34,3 +34,7 @@ var sasjsDebug="false";
 var CSSOverrides='';
 var JSOverrides='';
 
+/*
+ *  Allow overrides of default Portal URL pathname
+ */
+var sasPortalAppHome="/SASPortalApp";