diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/activesync_policy_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/activesync_policy_48.png
new file mode 100644
index 00000000..96533b42
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/activesync_policy_48.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/crm_storage_settings_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/crm_storage_settings_48.png
new file mode 100644
index 00000000..96533b42
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/crm_storage_settings_48.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/disclaimers_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/disclaimers_48.png
new file mode 100644
index 00000000..df5b6f8b
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/disclaimers_48.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/enterprisestorage_drive_maps_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/enterprisestorage_drive_maps_48.png
new file mode 100644
index 00000000..b24089d0
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/enterprisestorage_drive_maps_48.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/lync_federationdomains_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/lync_federationdomains_48.png
new file mode 100644
index 00000000..3e9ffeaa
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/lync_federationdomains_48.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/lync_phonenumbers_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/lync_phonenumbers_48.png
new file mode 100644
index 00000000..3e9ffeaa
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/lync_phonenumbers_48.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/lync_userplans_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/lync_userplans_48.png
new file mode 100644
index 00000000..3e9ffeaa
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/lync_userplans_48.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/mailboxplans_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/mailboxplans_48.png
new file mode 100644
index 00000000..96533b42
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/mailboxplans_48.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/public_folders_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/public_folders_48.png
new file mode 100644
index 00000000..b24089d0
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/public_folders_48.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/retentionpolicy_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/retentionpolicy_48.png
new file mode 100644
index 00000000..96533b42
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/retentionpolicy_48.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/retentionpolicytag_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/retentionpolicytag_48.png
new file mode 100644
index 00000000..96533b42
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/retentionpolicytag_48.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/sharepoint_storage_settings_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/sharepoint_storage_settings_48.png
new file mode 100644
index 00000000..3b3ecf68
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/sharepoint_storage_settings_48.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/sharepoint_storage_usage_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/sharepoint_storage_usage_48.png
new file mode 100644
index 00000000..3b3ecf68
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/sharepoint_storage_usage_48.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/storage_usages_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/storage_usages_48.png
new file mode 100644
index 00000000..96533b42
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/storage_usages_48.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
index 9db2a02d..3da7bae5 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
@@ -142,7 +142,7 @@
     <value>ActiveSync Policy</value>
   </data>
   <data name="Text.BlackBerryGroup" xml:space="preserve">
-    <value>BlackBerry</value>
+    <value>Hosted Organization - BlackBerry</value>
   </data>
   <data name="Text.BlackBerryUsers" xml:space="preserve">
     <value>BlackBerry Users</value>
@@ -151,10 +151,10 @@
     <value>Contacts</value>
   </data>
   <data name="Text.CRM2013Group" xml:space="preserve">
-    <value>CRM 2013</value>
+    <value>Hosted Organization - CRM 2013</value>
   </data>
   <data name="Text.CRMGroup" xml:space="preserve">
-    <value>CRM</value>
+    <value>Hosted Organization - CRM</value>
   </data>
   <data name="Text.CRMOrganization" xml:space="preserve">
     <value>CRM Organization</value>
@@ -178,19 +178,19 @@
     <value>Online Folders</value>
   </data>
   <data name="Text.EnterpriseStorageGroup" xml:space="preserve">
-    <value>Enterprise Storage</value>
+    <value>Hosted Organization - Enterprise Storage</value>
   </data>
   <data name="Text.ExchangeDomainNames" xml:space="preserve">
     <value>Accepted Domains</value>
   </data>
   <data name="Text.ExchangeGroup" xml:space="preserve">
-    <value>Exchange</value>
+    <value>Hosted Organization - Exchange</value>
   </data>
   <data name="Text.LyncFederationDomains" xml:space="preserve">
     <value>Lync Federation Domains</value>
   </data>
   <data name="Text.LyncGroup" xml:space="preserve">
-    <value>Lync</value>
+    <value>Hosted Organization - Lync</value>
   </data>
   <data name="Text.LyncPhoneNumbers" xml:space="preserve">
     <value>Phone Numbers</value>
@@ -208,13 +208,13 @@
     <value>Mailbox Plans</value>
   </data>
   <data name="Text.OCSGroup" xml:space="preserve">
-    <value>OCS</value>
+    <value>Hosted Organization - OCS</value>
   </data>
   <data name="Text.OCSUsers" xml:space="preserve">
     <value>OCS Users</value>
   </data>
   <data name="Text.OrganizationGroup" xml:space="preserve">
-    <value>Organization</value>
+    <value>Hosted Organization</value>
   </data>
   <data name="Text.OrganizationHome" xml:space="preserve">
     <value>Organization Statistics</value>
@@ -235,7 +235,7 @@
     <value>Setup</value>
   </data>
   <data name="Text.SharePointGroup" xml:space="preserve">
-    <value>SharePoint</value>
+    <value>Hosted Organization - SharePoint</value>
   </data>
   <data name="Text.SiteCollections" xml:space="preserve">
     <value>Sharepoint Sites</value>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs
index 4f537a5f..6aac93ba 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs
@@ -72,6 +72,11 @@ namespace WebsitePanel.Portal.UserControls
         public bool ShortMenu = false;
         public bool ShowImg = false;
 
+        public MenuItem OrganizationMenuRoot = null;
+        public MenuItem ExchangeMenuRoot = null;
+
+        public bool PutBlackBerryInExchange = false;
+
         public void BindMenu(MenuItemCollection items)
         {
             if ((PackageId <= 0) || (ItemID <= 0))
@@ -132,16 +137,23 @@ namespace WebsitePanel.Portal.UserControls
                 }
                 else
                 {
-                    MenuItem item = new MenuItem(GetLocalizedString("Text.OrganizationGroup"), "", "", null);
+                    MenuItem item;
+
+                    if (OrganizationMenuRoot != null) 
+                        item = OrganizationMenuRoot;
+                    else
+                        item = new MenuItem(GetLocalizedString("Text.OrganizationGroup"), "", "", null);
 
                     item.Selectable = false;
 
                     PrepareOrganizationMenu(item.ChildItems);
 
-                    if (item.ChildItems.Count > 0)
+                    if ((item.ChildItems.Count > 0) && (OrganizationMenuRoot == null))
                     {
                         items.Add(item);
                     }
+
+                    OrganizationMenuRoot = item;
                 }
             }
         }
@@ -188,6 +200,8 @@ namespace WebsitePanel.Portal.UserControls
                 {
                     items.Add(item);
                 }
+
+                ExchangeMenuRoot = item;
             }
         }
 
@@ -202,38 +216,38 @@ namespace WebsitePanel.Portal.UserControls
             if (Utils.CheckQouta(Quotas.EXCHANGE2007_DISTRIBUTIONLISTS, Cntx))
                 exchangeItems.Add(CreateMenuItem("DistributionLists", "dlists", @"Icons/exchange_dlists_48.png"));
 
-            if (ShortMenu) return;
+            //if (ShortMenu) return;
 
             if (Utils.CheckQouta(Quotas.EXCHANGE2007_PUBLICFOLDERS, Cntx))
-                exchangeItems.Add(CreateMenuItem("PublicFolders", "public_folders"));
+                exchangeItems.Add(CreateMenuItem("PublicFolders", "public_folders", @"Icons/public_folders_48.png"));
 
             if (!hideItems)
                 if (Utils.CheckQouta(Quotas.EXCHANGE2007_ACTIVESYNCALLOWED, Cntx))
-                    exchangeItems.Add(CreateMenuItem("ActiveSyncPolicy", "activesync_policy"));
+                    exchangeItems.Add(CreateMenuItem("ActiveSyncPolicy", "activesync_policy", @"Icons/activesync_policy_48.png"));
 
             if (!hideItems)
                 if (Utils.CheckQouta(Quotas.EXCHANGE2007_MAILBOXES, Cntx))
-                    exchangeItems.Add(CreateMenuItem("MailboxPlans", "mailboxplans"));
+                    exchangeItems.Add(CreateMenuItem("MailboxPlans", "mailboxplans", @"Icons/mailboxplans_48.png"));
 
             if (!hideItems)
                 if (Utils.CheckQouta(Quotas.EXCHANGE2013_ALLOWRETENTIONPOLICY, Cntx))
-                    exchangeItems.Add(CreateMenuItem("RetentionPolicy", "retentionpolicy"));
+                    exchangeItems.Add(CreateMenuItem("RetentionPolicy", "retentionpolicy", @"Icons/retentionpolicy_48.png"));
 
             if (!hideItems)
                 if (Utils.CheckQouta(Quotas.EXCHANGE2013_ALLOWRETENTIONPOLICY, Cntx))
-                    exchangeItems.Add(CreateMenuItem("RetentionPolicyTag", "retentionpolicytag"));
+                    exchangeItems.Add(CreateMenuItem("RetentionPolicyTag", "retentionpolicytag", @"Icons/retentionpolicytag_48.png"));
 
             if (!hideItems)
                 if (Utils.CheckQouta(Quotas.EXCHANGE2007_MAILBOXES, Cntx))
-                    exchangeItems.Add(CreateMenuItem("ExchangeDomainNames", "domains"));
+                    exchangeItems.Add(CreateMenuItem("ExchangeDomainNames", "domains", @"Icons/domains_48.png"));
 
             if (!hideItems)
                 if (Utils.CheckQouta(Quotas.EXCHANGE2007_MAILBOXES, Cntx))
-                    exchangeItems.Add(CreateMenuItem("StorageUsage", "storage_usage"));
+                    exchangeItems.Add(CreateMenuItem("StorageUsage", "storage_usage", @"Icons/storage_usages_48.png"));
 
             if (!hideItems)
                 if (Utils.CheckQouta(Quotas.EXCHANGE2007_DISCLAIMERSALLOWED, Cntx))
-                    exchangeItems.Add(CreateMenuItem("Disclaimers", "disclaimers"));
+                    exchangeItems.Add(CreateMenuItem("Disclaimers", "disclaimers", @"Icons/disclaimers_48.png"));
 
         }
 
@@ -263,9 +277,9 @@ namespace WebsitePanel.Portal.UserControls
             crmItems.Add(CreateMenuItem("CRMOrganization", "CRMOrganizationDetails", @"Icons/crm_orgs_48.png"));
             crmItems.Add(CreateMenuItem("CRMUsers", "CRMUsers", @"Icons/crm_users_48.png"));
 
-            if (ShortMenu) return;
+            //if (ShortMenu) return;
 
-            crmItems.Add(CreateMenuItem("StorageLimits", "crm_storage_settings"));
+            crmItems.Add(CreateMenuItem("StorageLimits", "crm_storage_settings", @"Icons/crm_storage_settings_48.png"));
         }
 
         private void PrepareCRM2013MenuRoot(MenuItemCollection items)
@@ -294,9 +308,9 @@ namespace WebsitePanel.Portal.UserControls
             crmItems.Add(CreateMenuItem("CRMOrganization", "CRMOrganizationDetails", @"Icons/crm_orgs_48.png"));
             crmItems.Add(CreateMenuItem("CRMUsers", "CRMUsers", @"Icons/crm_users_48.png"));
 
-            if (ShortMenu) return;
+            //if (ShortMenu) return;
 
-            crmItems.Add(CreateMenuItem("StorageLimits", "crm_storage_settings"));
+            crmItems.Add(CreateMenuItem("StorageLimits", "crm_storage_settings", @"Icons/crm_storage_settings_48.png"));
         }
 
         private void PrepareBlackBerryMenuRoot(MenuItemCollection items)
@@ -307,13 +321,24 @@ namespace WebsitePanel.Portal.UserControls
             }
             else
             {
-                MenuItem item = new MenuItem(GetLocalizedString("Text.BlackBerryGroup"), "", "", null);
+                MenuItem item;
+                bool additem = true;
+
+                if (PutBlackBerryInExchange && (ExchangeMenuRoot != null))
+                {
+                    item = ExchangeMenuRoot;
+                    additem = false;
+                }
+                else
+                    item = new MenuItem(GetLocalizedString("Text.BlackBerryGroup"), "", "", null);
 
                 item.Selectable = false;
 
                 PrepareBlackBerryMenu(item.ChildItems);
 
-                if (item.ChildItems.Count > 0)
+                additem = additem && (item.ChildItems.Count > 0);
+
+                if (additem)
                 {
                     items.Add(item);
                 }
@@ -351,10 +376,10 @@ namespace WebsitePanel.Portal.UserControls
         {
             spItems.Add(CreateMenuItem("SiteCollections", "sharepoint_sitecollections", @"Icons/sharepoint_sitecollections_48.png"));
 
-            if (ShortMenu) return;
+            //if (ShortMenu) return;
 
-            spItems.Add(CreateMenuItem("StorageUsage", "sharepoint_storage_usage"));
-            spItems.Add(CreateMenuItem("StorageLimits", "sharepoint_storage_settings"));
+            spItems.Add(CreateMenuItem("StorageUsage", "sharepoint_storage_usage", @"Icons/sharepoint_storage_usage_48.png"));
+            spItems.Add(CreateMenuItem("StorageLimits", "sharepoint_storage_settings", @"Icons/sharepoint_storage_settings_48.png"));
         }
 
         private void PrepareOCSMenuRoot(MenuItemCollection items)
@@ -408,16 +433,16 @@ namespace WebsitePanel.Portal.UserControls
         {
             lyncItems.Add(CreateMenuItem("LyncUsers", "lync_users", @"Icons/lync_users_48.png"));
 
-            if (ShortMenu) return;
+            //if (ShortMenu) return;
 
-            lyncItems.Add(CreateMenuItem("LyncUserPlans", "lync_userplans"));
+            lyncItems.Add(CreateMenuItem("LyncUserPlans", "lync_userplans", @"Icons/lync_userplans_48.png"));
 
 
             if (Utils.CheckQouta(Quotas.LYNC_FEDERATION, Cntx))
-                lyncItems.Add(CreateMenuItem("LyncFederationDomains", "lync_federationdomains"));
+                lyncItems.Add(CreateMenuItem("LyncFederationDomains", "lync_federationdomains", @"Icons/lync_federationdomains_48.png"));
 
             if (Utils.CheckQouta(Quotas.LYNC_PHONE, Cntx))
-                lyncItems.Add(CreateMenuItem("LyncPhoneNumbers", "lync_phonenumbers"));
+                lyncItems.Add(CreateMenuItem("LyncPhoneNumbers", "lync_phonenumbers", @"Icons/lync_phonenumbers_48.png"));
         }
 
         private void PrepareEnterpriseStorageMenuRoot(MenuItemCollection items)
@@ -445,10 +470,10 @@ namespace WebsitePanel.Portal.UserControls
         {
             enterpriseStorageItems.Add(CreateMenuItem("EnterpriseStorageFolders", "enterprisestorage_folders", @"Icons/enterprisestorage_folders_48.png"));
 
-            if (ShortMenu) return;
+            //if (ShortMenu) return;
 
             if (Utils.CheckQouta(Quotas.ENTERPRICESTORAGE_DRIVEMAPS, Cntx))
-                enterpriseStorageItems.Add(CreateMenuItem("EnterpriseStorageDriveMaps", "enterprisestorage_drive_maps"));
+                enterpriseStorageItems.Add(CreateMenuItem("EnterpriseStorageDriveMaps", "enterprisestorage_drive_maps", @"Icons/enterprisestorage_drive_maps_48.png"));
 
         }
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx
index 8ade5af5..9d56cc81 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx
@@ -1,33 +1,41 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="UserOrganization.ascx.cs" Inherits="WebsitePanel.Portal.UserOrganization" %>
 <%@ Import Namespace="WebsitePanel.Portal" %>
-<%@ Register Src="UserControls/ServerDetails.ascx" TagName="ServerDetails" TagPrefix="uc3" %>
-<%@ Register Src="UserControls/Comments.ascx" TagName="Comments" TagPrefix="uc4" %>
-<%@ Import Namespace="WebsitePanel.Portal" %>
 
 
 <asp:Panel ID="UserOrgPanel" runat="server" Visible="false">
-    <div class="IconsBlock">
-        <asp:DataList ID="OrgIcons" runat="server" 
-            CellSpacing="1" RepeatColumns="5" RepeatDirection="Horizontal">
-            <ItemTemplate>
-                <asp:Panel ID="IconPanel" runat="server" CssClass="Icon">
-                    <asp:HyperLink ID="imgLink" runat="server" NavigateUrl='<%# Eval("NavigateURL") %>'><asp:Image ID="imgIcon" runat="server" ImageUrl='<%# Eval("ImageUrl") %>' /></asp:HyperLink>
-                    <br />
-                    <asp:HyperLink ID="lnkIcon" runat="server" NavigateUrl='<%# Eval("NavigateURL") %>'><%# Eval("Text") %></asp:HyperLink>
-                </asp:Panel>
-                <asp:Panel ID="IconMenu" runat="server" CssClass="IconMenu" Visible='<%# IsIconMenuVisible(Eval("ChildItems")) %>'>
-                    <ul>
-                        <asp:Repeater ID="MenuItems" runat="server" DataSource='<%# GetIconMenuItems(Eval("ChildItems")) %>'>
-                            <ItemTemplate>
-                                <li><asp:HyperLink ID="HyperLink1" runat="server" NavigateUrl='<%# Eval("NavigateURL") %>'><%# Eval("Text") %></asp:HyperLink></li>
-                            </ItemTemplate>
-                        </asp:Repeater>
-                    </ul>
-                </asp:Panel>
-                <ajaxToolkit:HoverMenuExtender TargetControlID="IconPanel" PopupControlID="IconMenu" runat="server"
-                    PopupPosition="Right" HoverCssClass="Icon Hover"></ajaxToolkit:HoverMenuExtender>
-            </ItemTemplate>
-        </asp:DataList>
-    </div>
+
+    <asp:Repeater ID="OrgList" runat="server" EnableViewState="false">
+        <ItemTemplate>
+            <asp:Label ID="lblOrg" runat="server" CssClass="LinkText" meta:resourcekey="lblOrg" Text='<%# Eval("Text") %>' />
+            <div>
+
+                <div class="IconsBlock">
+                    <asp:DataList ID="OrgIcons" runat="server" DataSource='<%# GetIconMenuItems(Eval("ChildItems")) %>'
+                        CellSpacing="1" RepeatColumns="5" RepeatDirection="Horizontal">
+                        <ItemTemplate>
+                            <asp:Panel ID="IconPanel" runat="server" CssClass="Icon">
+                                <asp:HyperLink ID="imgLink" runat="server" NavigateUrl='<%# Eval("NavigateURL") %>'><asp:Image ID="imgIcon" runat="server" ImageUrl='<%# Eval("ImageUrl") %>' /></asp:HyperLink>
+                                <br />
+                                <asp:HyperLink ID="lnkIcon" runat="server" NavigateUrl='<%# Eval("NavigateURL") %>'><%# Eval("Text") %></asp:HyperLink>
+                            </asp:Panel>
+                            <asp:Panel ID="IconMenu" runat="server" CssClass="IconMenu" Visible='<%# IsIconMenuVisible(Eval("ChildItems")) %>'>
+                                <ul>
+                                    <asp:Repeater ID="MenuItems" runat="server" DataSource='<%# GetIconMenuItems(Eval("ChildItems")) %>'>
+                                        <ItemTemplate>
+                                            <li><asp:HyperLink ID="HyperLink1" runat="server" NavigateUrl='<%# Eval("NavigateURL") %>'><%# Eval("Text") %></asp:HyperLink></li>
+                                        </ItemTemplate>
+                                    </asp:Repeater>
+                                </ul>
+                            </asp:Panel>
+                            <ajaxToolkit:HoverMenuExtender TargetControlID="IconPanel" PopupControlID="IconMenu" runat="server"
+                                PopupPosition="Right" HoverCssClass="Icon Hover"></ajaxToolkit:HoverMenuExtender>
+                        </ItemTemplate>
+                    </asp:DataList>
+                </div>
+
+            </div>
+        </ItemTemplate>
+    </asp:Repeater>
+
 </asp:Panel>
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs
index a487dda2..84239131 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs
@@ -102,29 +102,33 @@ namespace WebsitePanel.Portal
 
         protected void Page_Load(object sender, EventArgs e)
         {
-            ShortMenu = true;
+            ShortMenu = false;
             ShowImg = true;
+            PutBlackBerryInExchange = true;
 
 
             if ((PackageId > 0) && (Cntx.Groups.ContainsKey(ResourceGroups.HostedOrganizations)))
             {
                 MenuItemCollection items = new MenuItemCollection();
 
+                OrganizationMenuRoot = new MenuItem(GetLocalizedString("Text.OrganizationGroup"), "", "", null);
+                items.Add(OrganizationMenuRoot);
+
                 if (ItemID > 0)
                 {
-                    items.Add(CreateMenuItem("OrganizationHome", "organization_home", @"Icons/organization_home_48.png"));
+                    OrganizationMenuRoot.ChildItems.Add(CreateMenuItem("OrganizationHome", "organization_home", @"Icons/organization_home_48.png"));
                     BindMenu(items);
                 }
                 else
                 {
-                    items.Add(CreateMenuItem("CreateOrganization", "create_organization", @"Icons/create_organization_48.png"));
+                    OrganizationMenuRoot.ChildItems.Add(CreateMenuItem("CreateOrganization", "create_organization", @"Icons/create_organization_48.png"));
                 }
 
 
                 UserOrgPanel.Visible = true;
 
-                OrgIcons.DataSource = items;
-                OrgIcons.DataBind();
+                OrgList.DataSource = items;
+                OrgList.DataBind();
             }
             else
                 UserOrgPanel.Visible = false;
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.designer.cs
index 26efff9f..0c00eff8 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.designer.cs
@@ -22,12 +22,12 @@ namespace WebsitePanel.Portal {
         protected global::System.Web.UI.WebControls.Panel UserOrgPanel;
         
         /// <summary>
-        /// OrgIcons control.
+        /// OrgList control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.DataList OrgIcons;
+        protected global::System.Web.UI.WebControls.Repeater OrgList;
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx
index da26021d..97281335 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx
@@ -56,7 +56,6 @@
                 </div>
             </div>
             <asp:Panel ID="OrgPanel" runat="server" Visible='<%# IsOrgPanelVisible((int)Eval("PackageID")) %>'>
-                <asp:Label ID="lblOrg" runat="server" CssClass="LinkText" meta:resourcekey="lblOrg" Text="Hosted Organization" />
                 <wsp:UserOrganization ID="UserOrganization" runat="server" PackageId='<%# (int)Eval("PackageID") %>' />
             </asp:Panel>
         </ItemTemplate>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj b/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
index a28a12e2..3c33cdbb 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
@@ -104,6 +104,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="App_Containers\Default\VPSForPC.ascx" />
+    <Content Include="App_Themes\Default\Icons\activesync_policy_48.png" />
     <Content Include="App_Themes\Default\Icons\advancedstatistics_48.png" />
     <Content Include="App_Themes\Default\Icons\applicationsinstaller_48.png" />
     <Content Include="App_Themes\Default\Icons\blackberry_users_48.png" />
@@ -111,15 +112,22 @@
     <Content Include="App_Themes\Default\Icons\configureVLan.png" />
     <Content Include="App_Themes\Default\Icons\create_organization_48.png" />
     <Content Include="App_Themes\Default\Icons\crm_orgs_48.png" />
+    <Content Include="App_Themes\Default\Icons\crm_storage_settings_48.png" />
     <Content Include="App_Themes\Default\Icons\crm_users_48.png" />
+    <Content Include="App_Themes\Default\Icons\disclaimers_48.png" />
     <Content Include="App_Themes\Default\Icons\domains_48.png" />
+    <Content Include="App_Themes\Default\Icons\enterprisestorage_drive_maps_48.png" />
     <Content Include="App_Themes\Default\Icons\enterprisestorage_folders_48.png" />
     <Content Include="App_Themes\Default\Icons\exchange_contacts_48.png" />
     <Content Include="App_Themes\Default\Icons\exchange_dlists_48.png" />
     <Content Include="App_Themes\Default\Icons\filemanager_48.png" />
     <Content Include="App_Themes\Default\Icons\ftp_48.png" />
+    <Content Include="App_Themes\Default\Icons\lync_federationdomains_48.png" />
+    <Content Include="App_Themes\Default\Icons\lync_phonenumbers_48.png" />
+    <Content Include="App_Themes\Default\Icons\lync_userplans_48.png" />
     <Content Include="App_Themes\Default\Icons\lync_users_48.png" />
     <Content Include="App_Themes\Default\Icons\mailboxes_48.png" />
+    <Content Include="App_Themes\Default\Icons\mailboxplans_48.png" />
     <Content Include="App_Themes\Default\Icons\mail_accounts_48.png" />
     <Content Include="App_Themes\Default\Icons\mail_domains_48.png" />
     <Content Include="App_Themes\Default\Icons\mail_forwardings_48.png" />
@@ -128,10 +136,16 @@
     <Content Include="App_Themes\Default\Icons\odbc_48.png" />
     <Content Include="App_Themes\Default\Icons\OK.png" />
     <Content Include="App_Themes\Default\Icons\organization_home_48.png" />
+    <Content Include="App_Themes\Default\Icons\public_folders_48.png" />
+    <Content Include="App_Themes\Default\Icons\retentionpolicytag_48.png" />
+    <Content Include="App_Themes\Default\Icons\retentionpolicy_48.png" />
     <Content Include="App_Themes\Default\Icons\scheduledtasks_48.png" />
     <Content Include="App_Themes\Default\Icons\sharedssl_48.png" />
     <Content Include="App_Themes\Default\Icons\sharepoint_sitecollections_48.png" />
+    <Content Include="App_Themes\Default\Icons\sharepoint_storage_settings_48.png" />
+    <Content Include="App_Themes\Default\Icons\sharepoint_storage_usage_48.png" />
     <Content Include="App_Themes\Default\Icons\spacehome_48.png" />
+    <Content Include="App_Themes\Default\Icons\storage_usages_48.png" />
     <Content Include="App_Themes\Default\Icons\vpsforpc_48.png" />
     <Content Include="App_Themes\Default\Icons\vps_48.png" />
     <Content Include="App_Themes\Default\Icons\webapplicationsgallery_48.png" />