diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css
index ce4f9f0e..9a1f2944 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css
@@ -315,6 +315,10 @@ TEXTAREA
 	font-weight: bold;
 }
 
+.OrgStatsQuota
+{
+	padding-left: 7px;
+}
 
 .HostingPlanGroup
 {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx
index 54576b4c..07e5cac1 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx
@@ -216,4 +216,7 @@
   <data name="Text.Users" xml:space="preserve">
     <value>Users</value>
   </data>
+  <data name="Text.OrganizationHome" xml:space="preserve">
+    <value>Organization Home</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationHome.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationHome.ascx
index 281ef47e..835b0f62 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationHome.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationHome.ascx
@@ -49,7 +49,7 @@
                         </tr>
 <!--
                         <tr class="OrgStatsRow">
-                            <td align="right" nowrap>
+                            <td align="right" >
                                 <asp:HyperLink ID="lnkDomains" runat="server" meta:resourcekey="lnkDomains"></asp:HyperLink>
                             </td>
                             <td width="100%">
@@ -58,10 +58,8 @@
                         </tr>
 -->
                         <tr class="OrgStatsRow">
-                            <td align="right" nowrap>
+                            <td class="OrgStatsQuota">
                                 <asp:HyperLink ID="lnkUsers" runat="server" meta:resourcekey="lnkUsers"></asp:HyperLink>
-                            </td>
-                            <td>
                                 <wsp:QuotaViewer ID="userStats" QuotaTypeId="2" runat="server" DisplayGauge="true" />
                             </td>
                         </tr>
@@ -74,50 +72,38 @@
                             </td>
                         </tr>
                         <tr class="OrgStatsRow"> 
-                            <td align="right" nowrap>
+                            <td class="OrgStatsQuota">
                                 <asp:HyperLink ID="lnkMailboxes" runat="server" meta:resourcekey="lnkMailboxes" />
-                            </td>
-                            <td>
                                 <wsp:QuotaViewer ID="mailboxesStats" QuotaTypeId="2" runat="server" DisplayGauge="true" />
                             </td>
                         </tr>
                         <tr class="OrgStatsRow" id="rowContacts" runat="server">
-                            <td align="right" nowrap>
+                            <td class="OrgStatsQuota">
                                 <asp:HyperLink ID="lnkContacts" runat="server" meta:resourcekey="lnkContacts"></asp:HyperLink>
-                            </td>
-                            <td>
                                 <wsp:QuotaViewer ID="contactsStats" QuotaTypeId="2" runat="server" DisplayGauge="true" />
                             </td>
                         </tr>
                         <tr class="OrgStatsRow" id="rowLists" runat="server">
-                            <td align="right" nowrap>
+                            <td class="OrgStatsQuota">
                                 <asp:HyperLink ID="lnkLists" runat="server" meta:resourcekey="lnkLists"></asp:HyperLink>
-                            </td>
-                            <td>
                                 <wsp:QuotaViewer ID="listsStats" QuotaTypeId="2" runat="server" DisplayGauge="true" />
                             </td>
                         </tr>
                         <tr class="OrgStatsRow"  id="rowFolders" runat="server">
-                            <td align="right" nowrap>
+                            <td class="OrgStatsQuota">
                                 <asp:HyperLink ID="lnkFolders" runat="server" meta:resourcekey="lnkFolders"></asp:HyperLink>
-                            </td>
-                            <td>
                                 <wsp:QuotaViewer ID="foldersStats" QuotaTypeId="2" runat="server" DisplayGauge="true" />
                             </td>
                         </tr>
                         <tr class="OrgStatsRow" id="rowExchangeStorage" runat="server">
-                            <td align="right" nowrap>
+                            <td class="OrgStatsQuota">
                                 <asp:HyperLink ID="lnkExchangeStorage" runat="server" meta:resourcekey="lnkExchangeStorage"></asp:HyperLink>
-                            </td>
-                            <td>
                                 <wsp:QuotaViewer ID="exchangeStorageStats" QuotaTypeId="2" runat="server" DisplayGauge="true" />
                             </td>
                         </tr>
                         <tr class="OrgStatsRow" id="rowExchangeLitigationHold" runat="server">
-                            <td align="right" nowrap>
+                            <td class="OrgStatsQuota">
                                 <asp:HyperLink ID="lnkExchangeLitigationHold" runat="server" meta:resourcekey="lnkExchangeLitigationHold"></asp:HyperLink>
-                            </td>
-                            <td>
                                 <wsp:QuotaViewer ID="exchangeLitigationHoldStats" QuotaTypeId="2" runat="server" DisplayGauge="true" />
                             </td>
                         </tr>
@@ -131,11 +117,10 @@
                             </td>
                         </tr>
                         <tr class="OrgStatsRow"> 
-                            <td align="right" nowrap>
+                            <td class="OrgStatsQuota">
                                 <asp:HyperLink ID="lnkBESUsers" runat="server" meta:resourcekey="lnkBESUsers" />
-                            </td>
-                            <td>
                                 <wsp:QuotaViewer ID="besUsersStats" QuotaTypeId="2" runat="server" DisplayGauge="true" />
+
                             </td>
                         </tr>
                         </asp:Panel>
@@ -147,17 +132,12 @@
                             </td>
                         </tr>
                         <tr class="OrgStatsRow"> 
-                            <td align="right" nowrap>
+                            <td class="OrgStatsQuota">
                                 <asp:HyperLink ID="lnkLyncUsers" runat="server" meta:resourcekey="lnkLyncUsers" />
-                            </td>
-                            <td>
                                 <wsp:QuotaViewer ID="lyncUsersStats" QuotaTypeId="2" runat="server" DisplayGauge="true" />
                             </td>
                         </tr>
                         </asp:Panel>
-
-
-
                         
                         <asp:Panel runat="server" ID="sharePointStatsPanel">
                         <tr class="OrgStatsRow">
@@ -167,10 +147,8 @@
                             </td>
                         </tr>
                         <tr class="OrgStatsRow">
-                            <td align="right" nowrap> 
+                            <td class="OrgStatsQuota"> 
                                 <asp:HyperLink ID="lnkSiteCollections" runat="server" meta:resourcekey="lnkSiteCollections"></asp:HyperLink>
-                            </td>
-                            <td>
                                 <wsp:QuotaViewer ID="siteCollectionsStats" QuotaTypeId="2" runat="server" DisplayGauge="true" />
                             </td>
                         </tr>
@@ -183,15 +161,12 @@
                             </td>
                         </tr>
                         <tr class="OrgStatsRow"> 
-                            <td align="right" nowrap>
+                            <td class="OrgStatsQuota">
                                 <asp:HyperLink ID="lnkOCSUsers" runat="server" meta:resourcekey="lnkOCSUsers" />
-                            </td>
-                            <td>
                                 <wsp:QuotaViewer ID="ocsUsersStats" QuotaTypeId="2" runat="server" DisplayGauge="true" />
                             </td>
                         </tr>
                         </asp:Panel>
-
                         
                         <asp:Panel runat="server" ID="crmStatsPanel">
                         <tr >
@@ -201,35 +176,27 @@
                             </td>
                         </tr>
                         <tr class="OrgStatsRow">
-                            <td align="right" nowrap>
+                            <td class="OrgStatsQuota">
                                 <asp:HyperLink ID="lnkCRMUsers" runat="server" meta:resourcekey="lnkCRMUsers" Text="Full licenses :"></asp:HyperLink>
-                            </td>
-                            <td>
                                 <wsp:QuotaViewer ID="crmUsersStats" QuotaTypeId="2" runat="server" DisplayGauge="true" />
                             </td>
                         </tr>
                         <tr class="OrgStatsRow">
-                            <td align="right" nowrap>
+                            <td class="OrgStatsQuota">
                                 <asp:HyperLink ID="lnkLimitedCRMUsers" runat="server" meta:resourcekey="lnkLimitedCRMUsers" Text="Limited licenses :"></asp:HyperLink>
-                            </td>
-                            <td>
                                 <wsp:QuotaViewer ID="crmLimitedUsersStats" QuotaTypeId="2" runat="server" DisplayGauge="true" />
                             </td>
                         </tr>
                         <tr class="OrgStatsRow">
-                            <td align="right" nowrap>
+                            <td class="OrgStatsQuota">
                                 <asp:HyperLink ID="lnkESSCRMUsers" runat="server" meta:resourcekey="lnkESSCRMUsers" Text="ESS licenses :"></asp:HyperLink>
-                            </td>
-                            <td>
                                 <wsp:QuotaViewer ID="crmESSUsersStats" QuotaTypeId="2" runat="server" DisplayGauge="true" />
                             </td>
                         </tr>
                         <tr class="OrgStatsRow">
-                            <td align="right" nowrap>
+                            <td class="OrgStatsQuota">
 				                <asp:HyperLink ID="lnkCRMDBSize" runat="server" meta:resourcekey="lnkCRMDBSize" Text="Storage size (MB):"></asp:HyperLink>
-                            </td>
-                            <td>
-				                <wsp:QuotaViewer ID="crmDBSize" runat="server" QuotaTypeId="2" DisplayGauge="true" />
+                                <wsp:QuotaViewer ID="crmDBSize" runat="server" QuotaTypeId="2" DisplayGauge="true" />
                             </td>
                         </tr>
                         </asp:Panel>
@@ -241,18 +208,14 @@
                             </td>
                         </tr>
                         <tr class="OrgStatsRow"> 
-                            <td align="right" nowrap>
+                            <td class="OrgStatsQuota">
                                 <asp:HyperLink ID="lnkEnterpriseStorageSpace" runat="server" meta:resourcekey="lnkEnterpriseStorageSpace" />
-                            </td>
-                            <td>
                                 <wsp:QuotaViewer ID="enterpriseStorageSpaceStats" QuotaTypeId="2" runat="server" DisplayGauge="true" />
                             </td>
                         </tr>
                         <tr class="OrgStatsRow">
-                            <td align="right" nowrap>
+                            <td class="OrgStatsQuota">
                                 <asp:HyperLink ID="lnkEnterpriseStorageFolders" runat="server" meta:resourcekey="lnkEnterpriseStorageFolders"></asp:HyperLink>
-                            </td>
-                            <td>
                                 <wsp:QuotaViewer ID="enterpriseStorageFoldersStats" QuotaTypeId="2" runat="server" DisplayGauge="true" />
                             </td>
                         </tr>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxTabs.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxTabs.ascx
index e39c4b60..6b964836 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxTabs.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxTabs.ascx
@@ -4,7 +4,7 @@
         <td>
            
             <asp:DataList ID="dlTabs" runat="server" RepeatDirection="Horizontal"
-                RepeatLayout="Flow" EnableViewState="false"  RepeatColumns="7" ItemStyle-Height="28px"  SeparatorStyle-CssClass="Separator" SeparatorStyle-Height="22px" >
+                RepeatLayout="Flow" EnableViewState="false"  RepeatColumns="9" ItemStyle-Height="28px"  SeparatorStyle-CssClass="Separator" SeparatorStyle-Height="22px" >
                 <ItemStyle Wrap="False" />
                 <ItemTemplate >
                     <asp:HyperLink ID="lnkTab" runat="server" CssClass="Tab" NavigateUrl='<%# Eval("Url") %>'>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/OrganizationMenu.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/OrganizationMenu.ascx.cs
index a96fb8b9..fb77da08 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/OrganizationMenu.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/OrganizationMenu.ascx.cs
@@ -63,6 +63,10 @@ namespace WebsitePanel.Portal
 
             string imagePath = String.Concat("~/", DefaultPage.THEMES_FOLDER, "/", Page.Theme, "/", "Images/Exchange", "/");
 
+            //Add "Organization Home" menu item
+            MenuItem item = new MenuItem(GetLocalizedString("Text.OrganizationHome"), "", "", null);
+            items.Add(item);
+
             //Organization menu group;
             if (cntx.Groups.ContainsKey(ResourceGroups.HostedOrganizations))
             PrepareOrganizationMenuRoot(cntx, items, imagePath);