diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IHierarchyItem.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IHierarchyItem.cs
index acebf9ac..94f7348f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IHierarchyItem.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IHierarchyItem.cs
@@ -59,7 +59,10 @@ namespace WebsitePanel.WebDav.Core
             {
                 get
                 {
-                    string displayName = _href.AbsoluteUri.Replace(_baseUri.AbsoluteUri, "");
+                    var href = HttpUtility.UrlDecode(_href.AbsoluteUri);
+                    var baseUri = HttpUtility.UrlDecode(_baseUri.AbsoluteUri);
+
+                    string displayName = href.Replace(baseUri, "");
                     displayName = Regex.Replace(displayName, "\\/$", "");
                     Match displayNameMatch = Regex.Match(displayName, "([\\/]+)$");
                     if (displayNameMatch.Success)
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/uploadingData2.js b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/uploadingData2.js
index 42c5384c..7988b483 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/uploadingData2.js
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/uploadingData2.js
@@ -24,6 +24,8 @@ function GetResources() {
                 GetResources();
                 oldResourcesDivHeight = $('#resourcesDiv').height();
             };
+
+            recalculateResourseHeight();
         }
     });
 };
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml
index ea0501a0..d07565d5 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml
@@ -33,7 +33,7 @@
                     if (account != null)
                     {
                         <a id="logout" class="nav navbar-text navbar-right" href="@Url.RouteUrl(AccountRouteNames.Logout)" title="Log out"><i class="glyphicon glyphicon-log-out"></i></a>
-                        <h4 id="username" class="nav navbar-text navbar-right">@account.UserName</h4>
+                        <h4 id="username" class="nav navbar-text navbar-right">@account.Login</h4>
                     }
 }
             </div>