diff --git a/DesktopModules/Vanjaro/Common/Factories/BrowseUploadFactory.cs b/DesktopModules/Vanjaro/Common/Factories/BrowseUploadFactory.cs
index 7622be963..21780994d 100644
--- a/DesktopModules/Vanjaro/Common/Factories/BrowseUploadFactory.cs
+++ b/DesktopModules/Vanjaro/Common/Factories/BrowseUploadFactory.cs
@@ -487,7 +487,7 @@ public static string GetLink(PortalSettings PortalSettings, ModuleInfo ActiveMod
         {
             string result = "";
             IFileInfo file = null;
-            if (HttpContext.Current != null && ActiveModule != null && !string.IsNullOrEmpty(fileurl))
+            if (HttpContext.Current != null && !string.IsNullOrEmpty(fileurl))
             {
                 if (fileurl.StartsWith("pages"))
                 {
@@ -631,13 +631,13 @@ public static string GetLink(PortalSettings PortalSettings, ModuleInfo ActiveMod
                                 }
                                 else
                                 {
-                                    file = FileManager.Instance.GetFile(ActiveModule.PortalID, fileurl.Replace(PortalSettings.HomeDirectory, ""));
+                                    file = FileManager.Instance.GetFile(PortalSettings.PortalId, fileurl.Replace(PortalSettings.HomeDirectory, ""));
                                 }
 
                                 if (file != null)
                                 {
                                     string str = string.Format("fileID={0}", file.FileId);
-                                    result = DotNetNuke.Common.Globals.LinkClick(str, ActiveModule.TabID, Null.NullInteger);
+                                    result = DotNetNuke.Common.Globals.LinkClick(str, PortalSettings.ActiveTab.TabID, Null.NullInteger);
                                 }
                             }
                             break;
@@ -649,13 +649,13 @@ public static string GetLink(PortalSettings PortalSettings, ModuleInfo ActiveMod
                                 }
                                 else
                                 {
-                                    file = FileManager.Instance.GetFile(ActiveModule.PortalID, fileurl.Replace(PortalSettings.HomeDirectory, ""));
+                                    file = FileManager.Instance.GetFile(PortalSettings.PortalId, fileurl.Replace(PortalSettings.HomeDirectory, ""));
                                 }
 
                                 if (file != null)
                                 {
                                     string str = string.Format("fileID={0}", file.FileId);
-                                    result = string.Format("{0}://{1}{2}", HttpContext.Current.Request.Url.Scheme, HttpContext.Current.Request.Url.Authority, DotNetNuke.Common.Globals.LinkClick(str, ActiveModule.TabID, Null.NullInteger));
+                                    result = string.Format("{0}://{1}{2}", HttpContext.Current.Request.Url.Scheme, HttpContext.Current.Request.Url.Authority, DotNetNuke.Common.Globals.LinkClick(str, PortalSettings.ActiveTab.TabID, Null.NullInteger));
                                 }
                             }
                             break;
diff --git a/DesktopModules/Vanjaro/Common/Frameworks/AngularJS/Plugins/mnCommonService/mnCommonService.css b/DesktopModules/Vanjaro/Common/Frameworks/AngularJS/Plugins/mnCommonService/mnCommonService.css
index 4d1e29ce5..cad094ffc 100644
--- a/DesktopModules/Vanjaro/Common/Frameworks/AngularJS/Plugins/mnCommonService/mnCommonService.css
+++ b/DesktopModules/Vanjaro/Common/Frameworks/AngularJS/Plugins/mnCommonService/mnCommonService.css
@@ -9,6 +9,7 @@ uiengine {
 .validationGroup label.error {
     font-size: 12px;
     color: red;
+    width: 100%
 }
 
 .control-background {
@@ -255,6 +256,7 @@ a.btn.btn-primary.button-left {
             margin-right: 5px;
             width: 5px;
         }
+
 .browseurl .uploaddefault .l_folder span.arrowicon {
     margin-right: 0px;
 }
@@ -267,10 +269,11 @@ a.btn.btn-primary.button-left {
     background-color: transparent !important;
     border-color: transparent !important;
 }
-    .uploaddefault .l_folder .pagedir span.arrowicon {
-        position: relative;
-        right: 10px;
-    }
+
+.uploaddefault .l_folder .pagedir span.arrowicon {
+    position: relative;
+    right: 10px;
+}
 
 .uploaddefault span.fas.fa-folder {
     font-size: 10px;
@@ -961,8 +964,8 @@ a.page-link.active {
     background: #eee;
 }
 
-ul.pagination{
-    justify-content:center;
+ul.pagination {
+    justify-content: center;
 }
 
 .pagination a.page-link.active,
@@ -1065,3 +1068,122 @@ ul.nav.nav-tabs {
     -o-transition: background-color .2s linear,width .2s ease-in-out;
     transition: background-color .2s linear,width .2s ease-in-out;
 }
+
+/*Common Css*/
+
+.accordion-item {
+    border-bottom: 1px solid rgba(0,0,0,.125);
+    border-bottom-right-radius: .25rem;
+    border-bottom-left-radius: .25rem;
+}
+
+.accordion-header {
+    border-bottom: 1px solid transparent;
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
+    background-color: rgba(0,0,0,.03);
+}
+
+.accordion-button .fa-caret-right, .accordion-button .fa-caret-down {
+    transform: rotate( 0deg );
+    transition: .5s transform ease-in-out;
+    font-size: 20px;
+}
+
+.accordion-button[aria-expanded="true"] .fa-caret-right {
+    transform: rotate( 90deg );
+    transition: .5s transform ease-in-out;
+}
+
+.accordion-button.collapsed .fa-caret-down {
+    transform: rotate( -90deg );
+    transition: .5s transform ease-in-out;
+}
+
+.accordion-header .accordion-button {
+    font-size: 16px;
+    color: #333;
+    line-height: 20px;
+    padding: 10px 15px 7px;
+    border-bottom: 1px solid transparent;
+    background-color: transparent;
+    display: inline-block;
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
+    text-decoration: none !important;
+}
+
+.accordion-item {
+    border-bottom: 1px solid rgba(0,0,0,.125);
+    border-bottom-right-radius: .25rem;
+    border-bottom-left-radius: .25rem;
+}
+
+    .accordion-item + .accordion-item {
+        margin-top: 5px;
+    }
+
+.dropdown .dropdown-menu a {
+    font-size: inherit;
+    font-weight: inherit;
+    line-height: inherit;
+    cursor: pointer;
+}
+
+.dropdown-menu .dropdown-item, .box-icon {
+    display: block;
+    font-size: 12px;
+    padding: 5px 10px 5px 5px;
+    cursor: pointer;
+}
+
+.dropdown .dropdown-menu .dropdown-item.active {
+    font-weight: bold !important;
+}
+
+.dropdown .dropdown-menu a.dropdown-item:active,
+.dropdown .dropdown-menu a.dropdown-item.active:hover,
+.dropdown .dropdown-menu a.dropdown-item:active em {
+    color: #16181b !important;
+    background: #ececec;
+}
+
+.dropdown.dropbtn .dropdownmenu:hover {
+    background: #eee;
+    transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;
+}
+
+.text-end.fixed-footer {
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: #fff;
+    padding: 15px;
+    z-index: 999;
+    display: block;
+    border-top: 1px solid #ccc;
+}
+
+.box-icon em {
+    width: 25px;
+    padding: 5px;
+    text-align: center;
+    color: #76838c;
+    font-size: 12px;
+    border-radius: 2px;
+    margin-right: 10px;
+}
+
+.toggle_right {
+    display: flex;
+    align-items: center;
+}
+
+    .toggle_right div {
+        margin-left: auto;
+    }
+
+    .toggle_right br {
+        display: none;
+    }
diff --git a/DesktopModules/Vanjaro/Common/Utilities/Utils.cs b/DesktopModules/Vanjaro/Common/Utilities/Utils.cs
index f3b80efe9..54c1a1152 100644
--- a/DesktopModules/Vanjaro/Common/Utilities/Utils.cs
+++ b/DesktopModules/Vanjaro/Common/Utilities/Utils.cs
@@ -149,7 +149,7 @@ public static string BrowseUrl(int ModuleId, bool InculdePopup, string Key = "",
                 }
                 else
                 {
-                    result += "popUp=true&hidecommandbar=true&SkinSrc=[G]Skins/_default/popUpSkin";
+                    result += "popUp=true&hidecommandbar=true&SkinSrc=[g]skins/vanjaro/base";
                 }
             }
             result = result.TrimEnd('?', '&');
diff --git a/DesktopModules/Vanjaro/Core/Extensions/Notification/Notification/Controllers/NotificationController.cs b/DesktopModules/Vanjaro/Core/Extensions/Notification/Notification/Controllers/NotificationController.cs
index 6acbc5f43..e59a322fa 100644
--- a/DesktopModules/Vanjaro/Core/Extensions/Notification/Notification/Controllers/NotificationController.cs
+++ b/DesktopModules/Vanjaro/Core/Extensions/Notification/Notification/Controllers/NotificationController.cs
@@ -49,10 +49,10 @@ public dynamic Dismiss(NotificationDTO postData)
             try
             {
                 NotificationManager.Dismiss(postData.NotificationId, this.UserInfo.UserID);
+                CacheFactory.Clear(CacheFactory.Keys.NotificationTask + "PortalID" + PortalSettings.PortalId);
                 response.NotifyCount = Core.Managers.NotificationManager.RenderNotificationsCount(PortalSettings.PortalId);
                 response.NotificationsCount = NotificationsController.Instance.CountNotifications(this.UserInfo.UserID, PortalSettings.PortalId);
                 response.IsSuccess = true;
-                CacheFactory.Clear(CacheFactory.Keys.NotificationTask + "PortalID" + PortalSettings.PortalId);
             }
             catch (Exception exc)
             {
@@ -75,9 +75,10 @@ public dynamic DismissAll()
                 {
                     NotificationManager.Dismiss(Notification.NotificationID, this.UserInfo.UserID);
                 }
-                response.TotalNotifications = TotalNotifications;
-                response.IsSuccess = true;
                 CacheFactory.Clear(CacheFactory.Keys.NotificationTask + "PortalID" + PortalSettings.PortalId);
+                response.NotifyCount = NotificationManager.RenderNotificationsCount(PortalSettings.PortalId);
+                response.NotificationsCount = NotificationsController.Instance.CountNotifications(this.UserInfo.UserID, PortalSettings.PortalId);
+                response.IsSuccess = true;
             }
             catch (Exception exc)
             {
diff --git a/DesktopModules/Vanjaro/Core/Extensions/Notification/Notification/Views/Notification/Notifications.js b/DesktopModules/Vanjaro/Core/Extensions/Notification/Notification/Views/Notification/Notifications.js
index 928090da8..c790b011c 100644
--- a/DesktopModules/Vanjaro/Core/Extensions/Notification/Notification/Views/Notification/Notifications.js
+++ b/DesktopModules/Vanjaro/Core/Extensions/Notification/Notification/Views/Notification/Notifications.js
@@ -35,9 +35,16 @@
         };
         common.webApi.post('Notification/Dismiss', '', postData).then(function (data) {
             if (data.data.IsSuccess) {
-                $("#VJnotifycount", parent.document).text(parseInt($("#VJnotifycount", parent.document).text()) - 1);
-                $('#Notification .Messagetab a>span', window.document).html(parseInt($('#Notification .Messagetab a>span', window.document).html()) - 1);
-                $('.registerlink-notification > sup > strong', parent.document).text(parseInt($('#Notification .Messagetab a>span', window.document).html()) - 1);
+                $("#VJnotifycount", parent.document).text(data.data.NotifyCount);
+                $('#Notification .Messagetab a>span', window.document).html(data.data.NotificationsCount);
+                //Set notification count (My Account) block in edit mode 
+                $(parent.document).find('.gjs-frame').contents().find('.registerlink-notification-profile sup strong').text(data.data.NotifyCount);
+
+                $(parent.document).find('.registerlink-notification span.badge').text(data.data.NotifyCount);
+                $(parent.document).find('.registerlink-notification-profile sup strong').text(data.data.NotifyCount);
+                //Set notification count in Mobile mode 
+                $(parent.document).find('.mobile-registerbox-btn sup strong').text(data.data.NotifyCount);
+
                 $scope.Pipe_NotificationsPages($scope.NotificationsPagestableState);
             }
         });
@@ -58,9 +65,16 @@
                 if (isConfirm) {
                     common.webApi.post('Notification/DismissAll', '',).then(function (data) {
                         if (data.data.IsSuccess) {
-                            $("#VJnotifycount", parent.document).text(parseInt($("#VJnotifycount", parent.document).text()) - data.data.TotalNotifications);
-                            $('#Notification .Messagetab a>span', window.document).html(parseInt($('#Notification .Messagetab a>span', window.document).html()) - data.data.TotalNotifications);
-                            $('.registerlink-notification > sup > strong', parent.document).text(parseInt($('#Notification .Messagetab a>span', window.document).html()) - data.data.TotalNotifications);
+                            $("#VJnotifycount", parent.document).text(data.data.NotifyCount);
+                            $('#Notification .Messagetab a>span', window.document).html(data.data.NotificationsCount);
+                            //Set notification count (My Account) block in edit mode 
+                            $(parent.document).find('.gjs-frame').contents().find('.registerlink-notification-profile sup strong').text(data.data.NotifyCount);
+
+                            $(parent.document).find('.registerlink-notification span.badge').text(data.data.NotifyCount);
+                            $(parent.document).find('.registerlink-notification-profile sup strong').text(data.data.NotifyCount);
+                            //Set notification count in Mobile mode 
+                            $(parent.document).find('.mobile-registerbox-btn sup strong').text(data.data.NotifyCount);
+
                             $scope.Pipe_NotificationsPages($scope.NotificationsPagestableState);
                         }
                     });
diff --git a/DesktopModules/Vanjaro/Core/Library/Entities/Editor/Editor.cs b/DesktopModules/Vanjaro/Core/Library/Entities/Editor/Editor.cs
index 25089872c..495451848 100644
--- a/DesktopModules/Vanjaro/Core/Library/Entities/Editor/Editor.cs
+++ b/DesktopModules/Vanjaro/Core/Library/Entities/Editor/Editor.cs
@@ -43,7 +43,10 @@ private static EditorOptions DefaultSettings()
             string url = "/api/vanjaro/";
             if (HttpContext.Current != null)
             {
-                var alias = PortalAliasController.Instance.GetPortalAliasesByPortalId(PortalSettings.Current.PortalId).OrderByDescending(a => a.IsPrimary).FirstOrDefault();
+                var alias = PortalAliasController.Instance.GetPortalAliasesByPortalId(PortalSettings.Current.PortalId).Where(x => x.CultureCode == PortalSettings.Current.CultureCode && x.IsPrimary).OrderByDescending(a => a.IsPrimary).FirstOrDefault();
+                if (alias == null)
+                    alias = PortalAliasController.Instance.GetPortalAliasesByPortalId(PortalSettings.Current.PortalId).OrderByDescending(a => a.IsPrimary).FirstOrDefault();
+
                 var httpAlias = DotNetNuke.Common.Globals.AddHTTP(alias.HTTPAlias);
                 var originalUrl = HttpContext.Current.Items["UrlRewrite:OriginalUrl"];
                 httpAlias = DotNetNuke.Common.Globals.AddPort(httpAlias, originalUrl?.ToString().ToLowerInvariant() ?? httpAlias);
diff --git a/DesktopModules/Vanjaro/Core/Library/Install/Core.01.03.01.SqlDataProvider b/DesktopModules/Vanjaro/Core/Library/Install/Core.01.03.01.SqlDataProvider
new file mode 100644
index 000000000..e69de29bb
diff --git a/DesktopModules/Vanjaro/Core/Library/Managers/NotificationManager.cs b/DesktopModules/Vanjaro/Core/Library/Managers/NotificationManager.cs
index 20c97de5f..640e8acc6 100644
--- a/DesktopModules/Vanjaro/Core/Library/Managers/NotificationManager.cs
+++ b/DesktopModules/Vanjaro/Core/Library/Managers/NotificationManager.cs
@@ -1,4 +1,7 @@
-using DotNetNuke.Services.Social.Messaging.Internal;
+using DotNetNuke.Common.Utilities;
+using DotNetNuke.Entities.Portals;
+using DotNetNuke.Services.Cache;
+using DotNetNuke.Services.Social.Messaging.Internal;
 using DotNetNuke.Services.Social.Notifications;
 using System;
 using System.Collections.Generic;
@@ -23,6 +26,11 @@ public static void Dismiss(int NotificationId, int UserID)
                 if (recipient != null)
                 {
                     NotificationsController.Instance.DeleteNotificationRecipient(NotificationId, UserID);
+
+                    #region Clear Notification count cache
+                    var cacheKey = string.Format(DataCache.UserNotificationsCountCacheKey, PortalSettings.Current.PortalId, UserID);
+                    CachingProvider.Instance().Clear("Prefix", cacheKey);
+                    #endregion
                 }
             }
             #endregion
diff --git a/DesktopModules/Vanjaro/Core/Library/Managers/SettingManager.cs b/DesktopModules/Vanjaro/Core/Library/Managers/SettingManager.cs
index a41304860..068b47498 100644
--- a/DesktopModules/Vanjaro/Core/Library/Managers/SettingManager.cs
+++ b/DesktopModules/Vanjaro/Core/Library/Managers/SettingManager.cs
@@ -194,6 +194,11 @@ public static void ApplyingSettings(string Version)
                             }
                         }
                         break;
+                    case "01.03.01":
+                        {
+                            HostController.Instance.Update("HostTitle", "Vanjaro");
+                        }
+                        break;
                 }
             }
 
diff --git a/DesktopModules/Vanjaro/Core/Library/Packager/Vanjaro/DotNetNuke.install.config.resources b/DesktopModules/Vanjaro/Core/Library/Packager/Vanjaro/DotNetNuke.install.config.resources
index fb1967171..006d8a227 100644
--- a/DesktopModules/Vanjaro/Core/Library/Packager/Vanjaro/DotNetNuke.install.config.resources
+++ b/DesktopModules/Vanjaro/Core/Library/Packager/Vanjaro/DotNetNuke.install.config.resources
@@ -51,7 +51,7 @@
     <HostFee></HostFee>
     <HostPortalId>0</HostPortalId>
     <HostSpace></HostSpace>
-    <HostTitle>DNN Corp</HostTitle>
+    <HostTitle>Vanjaro</HostTitle>
     <HostURL>http://www.dnnsoftware.com</HostURL>
     <HttpCompression>0</HttpCompression>
     <HttpCompressionLevel>0</HttpCompressionLevel>
diff --git a/DesktopModules/Vanjaro/Core/Library/Vanjaro.Core.csproj b/DesktopModules/Vanjaro/Core/Library/Vanjaro.Core.csproj
index 8df388c0c..0c5890b59 100644
--- a/DesktopModules/Vanjaro/Core/Library/Vanjaro.Core.csproj
+++ b/DesktopModules/Vanjaro/Core/Library/Vanjaro.Core.csproj
@@ -455,6 +455,7 @@
     <Content Include="Themes\Basic\scss\Bootstrap\_utilities.scss" />
     <Content Include="Themes\Basic\scss\Bootstrap\_variables.scss" />
     <Content Include="Install\Core.01.02.00.SqlDataProvider" />
+    <Content Include="Install\Core.01.03.01.SqlDataProvider" />
     <None Include="web.Debug.config">
       <DependentUpon>web.config</DependentUpon>
     </None>
diff --git a/DesktopModules/Vanjaro/Core/Library/Vanjaro.dnn b/DesktopModules/Vanjaro/Core/Library/Vanjaro.dnn
index faa926e49..e0f6a6edf 100644
--- a/DesktopModules/Vanjaro/Core/Library/Vanjaro.dnn
+++ b/DesktopModules/Vanjaro/Core/Library/Vanjaro.dnn
@@ -65,6 +65,11 @@
 							<name>Core.01.02.00.SqlDataProvider</name>
 							<version>01.02.00</version>
 						</script>
+            <script type="Install">
+              <path>Install</path>
+              <name>Core.01.03.01.SqlDataProvider</name>
+              <version>01.03.01</version>
+            </script>
 						<script type="UnInstall">
 							<path>Install</path>
 							<name>Uninstall.Core.SqlDataProvider</name>
@@ -1205,7 +1210,7 @@
 				<attributes>
 					<businessControllerClass>Vanjaro.Core.Components.BusinessController, Vanjaro.Core</businessControllerClass>
 					<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
-					<upgradeVersionsList>01.00.00,01.00.01,01.00.02,01.00.05,01.01.00,01.02.00</upgradeVersionsList>
+					<upgradeVersionsList>01.00.00,01.00.01,01.00.02,01.00.05,01.01.00,01.02.00,01.03.01</upgradeVersionsList>
 				</attributes>
 			</eventMessage>
 		</package>
diff --git a/DesktopModules/Vanjaro/Core/Library/VanjaroDistribution.dnn b/DesktopModules/Vanjaro/Core/Library/VanjaroDistribution.dnn
index 85b373a8b..9624d17c7 100644
--- a/DesktopModules/Vanjaro/Core/Library/VanjaroDistribution.dnn
+++ b/DesktopModules/Vanjaro/Core/Library/VanjaroDistribution.dnn
@@ -65,6 +65,11 @@
 							<name>Core.01.02.00.SqlDataProvider</name>
 							<version>01.02.00</version>
 						</script>
+            <script type="Install">
+              <path>Install</path>
+              <name>Core.01.03.01.SqlDataProvider</name>
+              <version>01.03.01</version>
+            </script>
 						<script type="UnInstall">
 							<path>Install</path>
 							<name>Uninstall.Core.SqlDataProvider</name>
@@ -1182,7 +1187,7 @@
 				<attributes>
 					<businessControllerClass>Vanjaro.Core.Components.BusinessController, Vanjaro.Core</businessControllerClass>
 					<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
-					<upgradeVersionsList>01.00.00,01.00.01,01.00.05,01.01.00,01.02.00</upgradeVersionsList>
+					<upgradeVersionsList>01.00.00,01.00.01,01.00.05,01.01.00,01.02.00,01.03.01</upgradeVersionsList>
 				</attributes>
 			</eventMessage>
 		</package>
diff --git a/DesktopModules/Vanjaro/UXManager/Extensions/Block/SearchResult/Resources/Scripts/SearchResult.js b/DesktopModules/Vanjaro/UXManager/Extensions/Block/SearchResult/Resources/Scripts/SearchResult.js
index c7085864f..1d8d26fce 100644
--- a/DesktopModules/Vanjaro/UXManager/Extensions/Block/SearchResult/Resources/Scripts/SearchResult.js
+++ b/DesktopModules/Vanjaro/UXManager/Extensions/Block/SearchResult/Resources/Scripts/SearchResult.js
@@ -11,7 +11,7 @@
             if (v.name == "data-block-guid") {
                 mappedAttr[v.name] = v.value;
             }
-            if (v.name != 'data-block-pageindex' && v.name != 'id')
+            if (v.name == 'data-block-global' || v.name == 'data-block-guid')
                 attr += '[' + v.name + '=' + v.value + ']';
         });
 
@@ -27,16 +27,16 @@
                 'RequestVerificationToken': sf.getAntiForgeryValue()
             },
             success: function (response) {
-                if (response != null) {                   
+                if (response != null) {
                     $.each(response, function (k, v) {
                         var findcurrentElement = '';
                         $.each($(v.Markup)[0].attributes, function (key, value) {
-                            if (value.name != 'data-block-pageindex' && value.name != 'id')
+                            if (value.name == 'data-block-global' || value.name == 'data-block-guid')
                                 findcurrentElement += '[' + value.name + '=' + value.value + ']';
                         });
 
                         if (attr == findcurrentElement) {
-                            $(obj).closest('div[data-block-global]').find('.searchresultsmarkup').append($(v.Markup).find('.searchresultsmarkup .conatiner.searchbox'));
+                            $(obj).closest('div[data-block-global]').find('.searchresultsmarkup').append($(v.Markup).find('.searchresultsmarkup .container.searchbox'));
                             $(obj).closest('div[data-block-global]').find('.searchresultsmarkup').attr('attr-searchresult-pageindex', PageIndex);
                             if (!Boolean.parse($(v.Markup).find('.searchresultsmarkup').attr('attr-searchresult-more')))
                                 $(obj).closest('div[data-block-global]').find(".Searchresultpage #showMore").hide();
diff --git a/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Extensions/Controllers/InstallPackageController.cs b/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Extensions/Controllers/InstallPackageController.cs
index abf6239f2..2197adb4b 100644
--- a/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Extensions/Controllers/InstallPackageController.cs
+++ b/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Extensions/Controllers/InstallPackageController.cs
@@ -43,15 +43,6 @@ public ActionResult Install()
             ActionResult actionResult = new ActionResult();
             List<InstallResultDto> installResults = Managers.InstallPackageManager.InstallPackage(PortalSettings, UserInfo, HttpContext.Current.Server.MapPath("\\DesktopModules\\Vanjaro\\Temp\\Install\\"));
             actionResult.Data = installResults;
-            if (installResults != null && installResults.Count > 0)
-            {
-                foreach (InstallResultDto InstallResultDto in installResults)
-                {
-                    PackageInfo packageInfo = PackageController.Instance.GetExtensionPackage(Null.NullInteger, (p) => p.PackageID == InstallResultDto.NewPackageId);
-                    if (packageInfo != null && packageInfo.PackageType.ToLower() == "module")
-                        ThemeManager.DeletePortalThemeCss();
-                }
-            }
             DataCache.ClearCache();
             actionResult.IsSuccess = true;
             return actionResult;
diff --git a/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Extensions/Managers/InstallPackageManager.cs b/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Extensions/Managers/InstallPackageManager.cs
index d8d229bc5..78c4ea8b4 100644
--- a/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Extensions/Managers/InstallPackageManager.cs
+++ b/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Extensions/Managers/InstallPackageManager.cs
@@ -110,6 +110,12 @@ internal static List<InstallResultDto> InstallPackage(PortalSettings portalSetti
                         InstallResultDto installResult = InstallController.Instance.InstallPackage(portalSettings, userInfo, null, item.Key, stream);
                         if (!installResult.Success)
                             installResults.Add(installResult);
+                        else
+                        {
+                            PackageInfo packageInfo = PackageController.Instance.GetExtensionPackage(Null.NullInteger, (p) => p.PackageID == installResult.NewPackageId);
+                            if (packageInfo != null && packageInfo.PackageType.ToLower() == "module")
+                                ThemeManager.DeletePortalThemeCss();
+                        }
                     }
                     catch (Exception ex)
                     {
diff --git a/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Extensions/Views/Settings/InstallPackage.html b/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Extensions/Views/Settings/InstallPackage.html
index ffff10195..ddf53b3e4 100644
--- a/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Extensions/Views/Settings/InstallPackage.html
+++ b/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Extensions/Views/Settings/InstallPackage.html
@@ -28,7 +28,7 @@
                     <hr />
                 </div>
                 <div class="text-end fixed-footer">
-                    <button type="button" ng-click="Click_Install()" class="btn btn-sm btn-primary">
+                    <button id="Finish" type="button" ng-disabled="DisableFinish" ng-click="Click_Install()" class="btn btn-sm btn-primary">
                         [L:Finish]
                     </button>
                 </div>
diff --git a/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Extensions/Views/Settings/InstallPackage.js b/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Extensions/Views/Settings/InstallPackage.js
index fbb93dc58..5e9e5551d 100644
--- a/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Extensions/Views/Settings/InstallPackage.js
+++ b/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Extensions/Views/Settings/InstallPackage.js
@@ -1,5 +1,6 @@
 app.controller('settings_installpackage', function ($scope, $attrs, $http, CommonSvc, $sce) {
     var common = CommonSvc.getData($scope);
+    $scope.DisableFinish = false;
     $scope.showInstall = true;
     $scope.onInit = function () {
         $scope.PackageError();
@@ -21,6 +22,8 @@
             }
         });
         if (val) {
+            $scope.DisableFinish = true;
+            $('#Finish').html('<span class="spinner-grow spinner-grow-sm" role="status" aria-hidden="true"></span> Installing...');
             common.webApi.get('InstallPackage/install').then(function (Response) {
                 if (Response.data.Data.length === 0) {
                     window.parent.ShowNotification('[L:Products]','[L:InstalledSuccessfully]', 'success');
@@ -32,6 +35,7 @@
                     $scope.ui.data.PackageErrorList.Options = Response.data.Data;
                     $scope.PackageError();
                 }
+                $scope.DisableFinish = false;
             });
         }
     };
diff --git a/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Pages/Views/Setting/Pages.js b/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Pages/Views/Setting/Pages.js
index 754881eb5..7ab381358 100644
--- a/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Pages/Views/Setting/Pages.js
+++ b/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Pages/Views/Setting/Pages.js
@@ -221,7 +221,7 @@
         switch (type) {
             case "homepage":
                 if ($scope.ui.data.DefaultPagesSettingsRequest.Options.HomeTabId == node.Value) {
-                    $scope.ui.data.DefaultPagesSettingsRequest.Options.HomeTabId = null;
+                    $scope.ui.data.DefaultPagesSettingsRequest.Options.HomeTabId = -1;
                     type = 'RemoveFrom_' + type;
                 }
                 else {
@@ -231,7 +231,7 @@
                 break;
             case "loginpage":
                 if ($scope.ui.data.DefaultPagesSettingsRequest.Options.LoginTabId == node.Value) {
-                    $scope.ui.data.DefaultPagesSettingsRequest.Options.LoginTabId = null;
+                    $scope.ui.data.DefaultPagesSettingsRequest.Options.LoginTabId = -1;
                     type = 'RemoveFrom_' + type;
                 }
                 else {
@@ -241,7 +241,7 @@
                 break;
             case "registrationpage":
                 if ($scope.ui.data.DefaultPagesSettingsRequest.Options.RegisterTabId == node.Value) {
-                    $scope.ui.data.DefaultPagesSettingsRequest.Options.RegisterTabId = null;
+                    $scope.ui.data.DefaultPagesSettingsRequest.Options.RegisterTabId = -1;
                     type = 'RemoveFrom_' + type;
                 }
                 else {
@@ -251,7 +251,7 @@
                 break;
             case "userprofilepage":
                 if ($scope.ui.data.DefaultPagesSettingsRequest.Options.UserTabId == node.Value) {
-                    $scope.ui.data.DefaultPagesSettingsRequest.Options.UserTabId = null;
+                    $scope.ui.data.DefaultPagesSettingsRequest.Options.UserTabId = -1;
                     type = 'RemoveFrom_' + type;
                 }
                 else {
@@ -261,7 +261,7 @@
                 break;
             case "searchresultspage":
                 if ($scope.ui.data.DefaultPagesSettingsRequest.Options.SearchTabId == node.Value) {
-                    $scope.ui.data.DefaultPagesSettingsRequest.Options.SearchTabId = null;
+                    $scope.ui.data.DefaultPagesSettingsRequest.Options.SearchTabId = -1;
                     type = 'RemoveFrom_' + type;
                 }
                 else {
@@ -271,7 +271,7 @@
                 break;
             case "404errorpage":
                 if ($scope.ui.data.DefaultPagesSettingsRequest.Options.Custom404TabId == node.Value) {
-                    $scope.ui.data.DefaultPagesSettingsRequest.Options.Custom404TabId = null;
+                    $scope.ui.data.DefaultPagesSettingsRequest.Options.Custom404TabId = -1;
                     type = 'RemoveFrom_' + type;
                 }
                 else {
@@ -281,7 +281,7 @@
                 break;
             case "500errorpage":
                 if ($scope.ui.data.DefaultPagesSettingsRequest.Options.Custom500TabId == node.Value) {
-                    $scope.ui.data.DefaultPagesSettingsRequest.Options.Custom500TabId = null;
+                    $scope.ui.data.DefaultPagesSettingsRequest.Options.Custom500TabId = -1;
                     type = 'RemoveFrom_' + type;
                 }
                 else {
@@ -291,7 +291,7 @@
                 break;
             case "PrivacyTabId":
                 if ($scope.ui.data.DefaultPagesSettingsRequest.Options.PrivacyTabId == node.Value) {
-                    $scope.ui.data.DefaultPagesSettingsRequest.Options.PrivacyTabId = null;
+                    $scope.ui.data.DefaultPagesSettingsRequest.Options.PrivacyTabId = -1;
                     type = 'RemoveFrom_' + type;
                 }
                 else {
@@ -301,7 +301,7 @@
                 break;
             case "TermsTabId":
                 if ($scope.ui.data.DefaultPagesSettingsRequest.Options.TermsTabId == node.Value) {
-                    $scope.ui.data.DefaultPagesSettingsRequest.Options.TermsTabId = null;
+                    $scope.ui.data.DefaultPagesSettingsRequest.Options.TermsTabId = -1;
                     type = 'RemoveFrom_' + type;
                 }
                 else {
@@ -311,7 +311,7 @@
                 break;
             case "RedirectAfterRegistration":
                 if ($scope.ui.data.DefaultPagesSettingsRequest.Options.RedirectAfterRegistrationTabId == node.Value) {
-                    $scope.ui.data.DefaultPagesSettingsRequest.Options.RedirectAfterRegistrationTabId = null;
+                    $scope.ui.data.DefaultPagesSettingsRequest.Options.RedirectAfterRegistrationTabId = -1;
                     type = 'RemoveFrom_' + type;
                 }
                 else {
@@ -321,7 +321,7 @@
                 break;
             case "RedirectAfterLogin":
                 if ($scope.ui.data.DefaultPagesSettingsRequest.Options.RedirectAfterLoginTabId == node.Value) {
-                    $scope.ui.data.DefaultPagesSettingsRequest.Options.RedirectAfterLoginTabId = null;
+                    $scope.ui.data.DefaultPagesSettingsRequest.Options.RedirectAfterLoginTabId = -1;
                     type = 'RemoveFrom_' + type;
                 }
                 else {
@@ -331,7 +331,7 @@
                 break;
             case "RedirectAfterLogout":
                 if ($scope.ui.data.DefaultPagesSettingsRequest.Options.RedirectAfterLogoutTabId == node.Value) {
-                    $scope.ui.data.DefaultPagesSettingsRequest.Options.RedirectAfterLogoutTabId = null;
+                    $scope.ui.data.DefaultPagesSettingsRequest.Options.RedirectAfterLogoutTabId = -1;
                     type = 'RemoveFrom_' + type;
                 }
                 else {
diff --git a/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Users/Controllers/UserController.cs b/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Users/Controllers/UserController.cs
index 3e3308dfc..d6d28634a 100644
--- a/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Users/Controllers/UserController.cs
+++ b/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Users/Controllers/UserController.cs
@@ -121,7 +121,10 @@ public static List<IUIData> GetData(string Identifier, Dictionary<string, string
                             UserInfo user = DotNetNuke.Entities.Users.UserController.GetUserById(ps.PortalId, UserID);
                             UserBasicDto userDetails = UsersController.Instance.GetUserDetail(ps.PortalId, UserID);
                             ProfileController.GetUserProfile(ref user);
-                            Settings.Add("BrowseUrl", new UIData { Name = "BrowseUrl", Value = Common.Utilities.Utils.BrowseUrl(-1, "Manage") });
+                            Dictionary<string, string> additionalParameters = new Dictionary<string, string>();
+                            additionalParameters.Add("icp=", "true");
+                            additionalParameters.Add("guid=", ExtensionInfo.GUID.ToLower());
+                            Settings.Add("BrowseUrl", new UIData { Name = "BrowseUrl", Value = Common.Utilities.Utils.BrowseUrl(0, true, "", additionalParameters) });
                             Settings.Add("AllowedAttachmentFileExtensions", new UIData { Name = "AllowedAttachmentFileExtensions", Value = FileSetting.FileType });
                             Settings.Add("MaxFileSize", new UIData { Name = "MaxFileSize", Value = FileSetting.FileSize.ToString() });
                             Settings.Add("UserDetails", new UIData { Name = "UserDetails", Options = UserManager.MapUserBasicDto(user, userDetails) });
diff --git a/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Users/Factories/AppFactory.cs b/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Users/Factories/AppFactory.cs
index 0b55fdd56..f61a1676a 100644
--- a/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Users/Factories/AppFactory.cs
+++ b/DesktopModules/Vanjaro/UXManager/Extensions/Menu/Users/Factories/AppFactory.cs
@@ -141,6 +141,18 @@ public static List<AngularView> GetViews()
 
             Views.Add(import);
 
+            Views.Add(
+                new AngularView
+                {
+                    Identifier = Identifier.common_controls_url.ToString(),
+                    IsCommon = true,
+                    UrlPaths = new List<string>() { "common/controls/url/:uid" },
+                    TemplatePath = "common/controls/url.html",
+                    AccessRoles = "user",
+                    Defaults = new Dictionary<string, string>()
+                }
+            );
+
             return Views;
         }
 
@@ -190,7 +202,7 @@ public static string GetRuntimeVersion
         }
         public enum Identifier
         {
-            setting_setting, setting_adduser, setting_users, setting_changepassword, setting_updateprofile, setting_import
+            setting_setting, setting_adduser, setting_users, setting_changepassword, setting_updateprofile, setting_import, common_controls_url
         }
     }
 }
\ No newline at end of file
diff --git a/DesktopModules/Vanjaro/UXManager/Extensions/Migrate/Install/Migrate.01.00.00.SqlDataProvider b/DesktopModules/Vanjaro/UXManager/Extensions/Migrate/Install/Migrate.01.00.00.SqlDataProvider
index e4022687e..6715dd9a2 100644
--- a/DesktopModules/Vanjaro/UXManager/Extensions/Migrate/Install/Migrate.01.00.00.SqlDataProvider
+++ b/DesktopModules/Vanjaro/UXManager/Extensions/Migrate/Install/Migrate.01.00.00.SqlDataProvider
@@ -1,5 +1,5 @@
-IF Not EXISTS (select * from {databaseOwner}[PersonaBarMenu] Where Identifier='Vanjaro' and ModuleName='Vanjaro')
+IF Not EXISTS (select * from {databaseOwner}[{objectQualifier}PersonaBarMenu] Where Identifier='Vanjaro' and ModuleName='Vanjaro')
 BEGIN
-INSERT INTO {databaseOwner}[PersonaBarMenu]([Identifier],[ModuleName],[FolderName],[Controller],[ResourceKey],[Path],[Link],[CssClass],[ParentId],[Order],[AllowHost],[Enabled],[CreatedByUserId],[CreatedOnDate],[LastModifiedByUserId],[LastModifiedOnDate],[IconFile])VALUES('Vanjaro','Vanjaro',NULL,'','Vanjaro','Vanjaro',NULL,NULL,2,1000,1,1,-1,GETDATE(),-1,GETDATE(),NULL)
+INSERT INTO {databaseOwner}[{objectQualifier}PersonaBarMenu]([Identifier],[ModuleName],[FolderName],[Controller],[ResourceKey],[Path],[Link],[CssClass],[ParentId],[Order],[AllowHost],[Enabled],[CreatedByUserId],[CreatedOnDate],[LastModifiedByUserId],[LastModifiedOnDate],[IconFile])VALUES('Vanjaro','Vanjaro',NULL,'','Vanjaro','Vanjaro',NULL,NULL,2,1000,1,1,-1,GETDATE(),-1,GETDATE(),NULL)
 End
 GO
diff --git a/DesktopModules/Vanjaro/UXManager/Library/Managers/PageManager.cs b/DesktopModules/Vanjaro/UXManager/Library/Managers/PageManager.cs
index 552b3fbdb..f8e6dc240 100644
--- a/DesktopModules/Vanjaro/UXManager/Library/Managers/PageManager.cs
+++ b/DesktopModules/Vanjaro/UXManager/Library/Managers/PageManager.cs
@@ -332,7 +332,7 @@ private static string AppendQueryParameters(PortalSettings pS, int TabID, string
                 {
                     URL += "&TabId=" + TabID;
 
-                    if (LocaleController.Instance.GetLocales(pS.PortalId).Count() > 1)
+                    if (LocaleController.Instance.GetLocales(pS.PortalId).Count() > 1 && !string.IsNullOrEmpty(Language))
                         URL += "&language=" + Language;
                 }
                 URL += QueryParameters;
diff --git a/Portals/_default/Skins/Vanjaro/Base.ascx.cs b/Portals/_default/Skins/Vanjaro/Base.ascx.cs
index 76499b490..8f5a283c8 100644
--- a/Portals/_default/Skins/Vanjaro/Base.ascx.cs
+++ b/Portals/_default/Skins/Vanjaro/Base.ascx.cs
@@ -628,11 +628,22 @@ private void RemoveDataBlocks(HtmlDocument html)
                 if (item.Attributes.Where(a => a.Name == "data-block-type").FirstOrDefault() != null && item.Attributes.Where(a => a.Name == "data-block-type").FirstOrDefault().Value == "Language" && item.Attributes.Where(a => a.Name == "id").FirstOrDefault() != null && string.IsNullOrEmpty(item.InnerHtml))
                     AttributesToRemove.Add(item.Attributes.Where(a => a.Name == "id").FirstOrDefault());
 
-                foreach (var Attribute in item.Attributes)
+                if (item.Attributes.Where(a => a.Name == "data-block-type").FirstOrDefault() != null && item.Attributes.Where(a => a.Name == "data-block-type").FirstOrDefault().Value == "Search Result")
                 {
+                    foreach (var Attribute in item.Attributes)
+                    {
+                        if (!Attribute.Name.StartsWith("data-block-global") && !Attribute.Name.StartsWith("data-block-guid"))
+                            AttributesToRemove.Add(Attribute);
+                    }
+                }
+                else
+                {
+                    foreach (var Attribute in item.Attributes)
+                    {
 
-                    if (Attribute.Name.StartsWith("data-block-"))
-                        AttributesToRemove.Add(Attribute);
+                        if (Attribute.Name.StartsWith("data-block-"))
+                            AttributesToRemove.Add(Attribute);
+                    }
                 }
                 foreach (var Attribute in AttributesToRemove)
                     item.Attributes.Remove(Attribute);