diff --git a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor
index b7084f19..a0ad0257 100644
--- a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor
@@ -17,15 +17,15 @@
         }
     }
 </div>
-<br />
-<br />
 
 @code {
+    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+
     List<Page> pages;
 
     protected override void OnInitialized()
     {
-    // display list of pages which are children of current page
-    pages = PageState.Pages.Where(item => item.ParentId == PageState.Page.PageId).ToList();
+        Page admin = PageState.Pages.Where(item => item.Path == "admin").FirstOrDefault();
+        pages = PageState.Pages.Where(item => item.ParentId == admin.PageId).ToList();
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Files/Add.razor b/Oqtane.Client/Modules/Admin/Files/Add.razor
index ffe3edcb..fca41914 100644
--- a/Oqtane.Client/Modules/Admin/Files/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Add.razor
@@ -30,13 +30,14 @@
             {
                 ShowProgressIndicator();
 
-                if (await FileService.UploadFilesAsync(PageState.Site.SiteRootPath, files, ""))
+                string result = await FileService.UploadFilesAsync(PageState.Site.SiteRootPath, files, "");
+                if (result == "")
                 {
                     AddModuleMessage("Files Uploaded Successfully", MessageType.Success);
                 }
                 else
                 {
-                    AddModuleMessage("Upload Failed", MessageType.Error);
+                    AddModuleMessage("Upload Failed For " + result.Replace(",",", ") + ". This Could Be Due To A Network Error Or Because A File Type Is Restricted.", MessageType.Error);
                 }
             }
             catch (Exception ex)
diff --git a/Oqtane.Client/Modules/Admin/Files/Index.razor b/Oqtane.Client/Modules/Admin/Files/Index.razor
index eb07e32d..b73936b8 100644
--- a/Oqtane.Client/Modules/Admin/Files/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Index.razor
@@ -9,7 +9,7 @@
 }
 else
 {
-    <ActionLink Action="Add" Text="Add File" Style="float: right; margin: 10px;" />
+    <ActionLink Action="Add" Text="Add Files" Style="float: right; margin: 10px;" />
 
     <Pager Items="@Files">
         <Header>
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
index cf7fd55e..810ae6c7 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
@@ -74,7 +74,8 @@
             {
                 try
                 {
-                    if (await FileService.UploadFilesAsync("Modules", files, ""))
+                    string result = await FileService.UploadFilesAsync("Modules", files, "");
+                    if (result == "")
                     {
                         AddModuleMessage("Module Uploaded Successfully. Click Install To Complete Installation.", MessageType.Success);
                         uploaded = true;
@@ -82,7 +83,7 @@
                     }
                     else
                     {
-                        AddModuleMessage("Module Upload Failed.", MessageType.Error);
+                        AddModuleMessage("Upload Failed For " + result.Replace(",",", ") + ". This Could Be Due To A Network Error Or Because A File Type Is Restricted.", MessageType.Error);
                     }
                 }
                 catch (Exception ex)
diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor
index dd60562b..aad68ca5 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor
@@ -73,7 +73,8 @@
             {
                 try
                 {
-                    if (await FileService.UploadFilesAsync("Themes", files, ""))
+                    string result = await FileService.UploadFilesAsync("Themes", files, "");
+                    if (result == "")
                     {
                         AddModuleMessage("Theme Uploaded Successfully. Click Install To Complete Installation.", MessageType.Success);
                         uploaded = true;
@@ -81,7 +82,7 @@
                     }
                     else
                     {
-                        AddModuleMessage("Theme Upload Failed.", MessageType.Error);
+                        AddModuleMessage("Upload Failed For " + result.Replace(",",", ") + ". This Could Be Due To A Network Error Or Because A File Type Is Restricted.", MessageType.Error);
                     }
                 }
                 catch (Exception ex)
diff --git a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
index e6fe6e56..827069e2 100644
--- a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
@@ -62,7 +62,8 @@ else
             {
                 try
                 {
-                    if (await FileService.UploadFilesAsync("Framework", files, ""))
+                    string result = await FileService.UploadFilesAsync("Framework", files, "");
+                    if (result == "")
                     {
                         AddModuleMessage("Framework Uploaded Successfully. Click Upgrade To Complete Installation.", MessageType.Success);
                         uploaded = true;
@@ -70,7 +71,7 @@ else
                     }
                     else
                     {
-                        AddModuleMessage("Framework Upload Failed.", MessageType.Error);
+                        AddModuleMessage("Upload Failed For " + result.Replace(",",", ") + ". This Could Be Due To A Network Error Or Because A File Type Is Restricted.", MessageType.Error);
                     }
                 }
                 catch (Exception ex)
diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
index 624ea38b..e1400d6f 100644
--- a/Oqtane.Client/Modules/HtmlText/Edit.razor
+++ b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -6,13 +6,13 @@
 @inject HttpClient http
 @inject SiteState sitestate
 
-<table class="form-group">
+<table class="table table-borderless">
     <tr>
         <td>
             <label for="Name" class="control-label">Content: </label>
         </td>
         <td>
-            <textarea class="form-control" @bind="@content" rows="5" style="width:400px;" />
+            <textarea class="form-control" @bind="@content" rows="5" />
         </td>
     </tr>
 </table>
diff --git a/Oqtane.Client/Services/FileService.cs b/Oqtane.Client/Services/FileService.cs
index 296764d1..240bb144 100644
--- a/Oqtane.Client/Services/FileService.cs
+++ b/Oqtane.Client/Services/FileService.cs
@@ -33,17 +33,20 @@ namespace Oqtane.Services
             return await http.GetJsonAsync<List<string>>(apiurl + "?folder=" + Folder);
         }
 
-        public async Task<bool> UploadFilesAsync(string Folder, string[] Files, string FileUploadName)
+        public async Task<string> UploadFilesAsync(string Folder, string[] Files, string FileUploadName)
         {
-            bool success = false;
+            string result = "";
+
             var interop = new Interop(jsRuntime);
             await interop.UploadFiles(apiurl + "/upload", Folder, FileUploadName);
 
             // uploading files is asynchronous so we need to wait for the upload to complete
+            bool success = false;
             int attempts = 0;
             while (attempts < 5 && success == false)
             {
                 Thread.Sleep(2000); // wait 2 seconds
+                result = "";
 
                 List<string> files = await GetFilesAsync(Folder);
                 if (files.Count > 0)
@@ -54,13 +57,18 @@ namespace Oqtane.Services
                         if (!files.Contains(file))
                         {
                             success = false;
+                            result += file + ",";
                         }
                     }
                 }
                 attempts += 1;
             }
+            if (!success)
+            {
+                result = result.Substring(0, result.Length - 1);
+            }
 
-            return success;
+            return result;
         }
 
         public async Task DeleteFileAsync(string Folder, string File)
diff --git a/Oqtane.Client/Services/Interfaces/IFileService.cs b/Oqtane.Client/Services/Interfaces/IFileService.cs
index 1cff111c..b840397b 100644
--- a/Oqtane.Client/Services/Interfaces/IFileService.cs
+++ b/Oqtane.Client/Services/Interfaces/IFileService.cs
@@ -7,7 +7,7 @@ namespace Oqtane.Services
     public interface IFileService
     {
         Task<List<string>> GetFilesAsync(string Folder);
-        Task<bool> UploadFilesAsync(string Folder, string[] Files, string FileUploadName);
+        Task<string> UploadFilesAsync(string Folder, string[] Files, string FileUploadName);
         Task DeleteFileAsync(string Folder, string File);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/IModuleService.cs b/Oqtane.Client/Services/Interfaces/IModuleService.cs
index a9b66735..b51a946b 100644
--- a/Oqtane.Client/Services/Interfaces/IModuleService.cs
+++ b/Oqtane.Client/Services/Interfaces/IModuleService.cs
@@ -6,8 +6,7 @@ namespace Oqtane.Services
 {
     public interface IModuleService
     {
-        Task<List<Module>> GetModulesAsync(int PageId);
-        Task<List<Module>> GetModulesAsync(int SiteId, string ModuleDefinitionName);
+        Task<List<Module>> GetModulesAsync(int SiteId);
         Task<Module> GetModuleAsync(int ModuleId);
         Task<Module> AddModuleAsync(Module Module);
         Task<Module> UpdateModuleAsync(Module Module);
diff --git a/Oqtane.Client/Services/ModuleService.cs b/Oqtane.Client/Services/ModuleService.cs
index 12e4af26..09c47de7 100644
--- a/Oqtane.Client/Services/ModuleService.cs
+++ b/Oqtane.Client/Services/ModuleService.cs
@@ -26,21 +26,15 @@ namespace Oqtane.Services
             get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Module"); }
         }
 
-        public async Task<List<Module>> GetModulesAsync(int PageId)
+        public async Task<List<Module>> GetModulesAsync(int SiteId)
         {
-            List<Module> modules = await http.GetJsonAsync<List<Module>>(apiurl + "?pageid=" + PageId.ToString());
+            List<Module> modules = await http.GetJsonAsync<List<Module>>(apiurl + "?siteid=" + SiteId.ToString());
             modules = modules
                 .OrderBy(item => item.Order)
                 .ToList();
             return modules;
         }
 
-        public async Task<List<Module>> GetModulesAsync(int SiteId, string ModuleDefinitionName)
-        {
-            List<Module> modules = await http.GetJsonAsync<List<Module>>(apiurl + "?siteid=" + SiteId.ToString() + "&moduledefinitionname=" + ModuleDefinitionName);
-            return modules.ToList();
-        }
-
         public async Task<Module> GetModuleAsync(int ModuleId)
         {
             return await http.GetJsonAsync<Module>(apiurl + "/" + ModuleId.ToString());
diff --git a/Oqtane.Client/Shared/Pane.razor b/Oqtane.Client/Shared/Pane.razor
index e943529b..e45f3efd 100644
--- a/Oqtane.Client/Shared/Pane.razor
+++ b/Oqtane.Client/Shared/Pane.razor
@@ -117,7 +117,7 @@
                 }
                 else
                 {
-                    foreach (Module module in PageState.Modules.Where(item => item.Pane.ToLower() == Name.ToLower() && !item.IsDeleted).OrderBy(x => x.Order).ToArray())
+                    foreach (Module module in PageState.Modules.Where(item => item.PageId == PageState.Page.PageId && item.Pane.ToLower() == Name.ToLower() && !item.IsDeleted).OrderBy(x => x.Order).ToArray())
                     {
                         // check if user is authorized to view module
                         if (UserSecurity.IsAuthorized(PageState.User, "View", module.Permissions))
diff --git a/Oqtane.Client/Shared/SiteRouter.razor b/Oqtane.Client/Shared/SiteRouter.razor
index 8a770e6c..91ae2d42 100644
--- a/Oqtane.Client/Shared/SiteRouter.razor
+++ b/Oqtane.Client/Shared/SiteRouter.razor
@@ -159,18 +159,18 @@
             // extract admin route elements from path
             string[] segments = path.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
             int result;
+            // check if path has moduleid and control specification ie. page/moduleid/control/
             if (segments.Length >= 2 && int.TryParse(segments[segments.Length - 2], out result))
             {
-                // path has moduleid and control specification ie. page/moduleid/control/
                 control = segments[segments.Length - 1];
                 moduleid = result;
                 path = path.Replace(moduleid.ToString() + "/" + control + "/", "");
             }
             else
             {
-                if (segments.Length >= 2 && int.TryParse(segments[segments.Length - 2], out result))
+                // check if path has only moduleid specification ie. page/moduleid/
+                if (segments.Length >= 1 && int.TryParse(segments[segments.Length - 1], out result))
                 {
-                    // path has only moduleid specification ie. page/moduleid/
                     moduleid = result;
                     path = path.Replace(moduleid.ToString() + "/", "");
                 }
@@ -244,8 +244,8 @@
 
                     if (PageState == null || reload >= Reload.Page)
                     {
-                        modules = await ModuleService.GetModulesAsync(page.PageId);
-                        modules = ProcessModules(modules, moduledefinitions, pagestate.Control, page.Panes, site);
+                        modules = await ModuleService.GetModulesAsync(site.SiteId);
+                        modules = ProcessModules(modules, moduledefinitions, page.PageId, pagestate.ModuleId, pagestate.Control, page.Panes, site.DefaultContainerType);
                     }
                     else
                     {
@@ -341,15 +341,9 @@
         return page;
     }
 
-    private List<Module> ProcessModules(List<Module> modules, List<ModuleDefinition> moduledefinitions, string control, string panes, Site site)
+    private List<Module> ProcessModules(List<Module> modules, List<ModuleDefinition> moduledefinitions, int pageid, int moduleid, string control, string panes, string defaultcontainertype)
     {
         ModuleDefinition moduledefinition;
-
-        if (control == "")
-        {
-            control = Constants.DefaultControl;
-        }
-
         Dictionary<string, int> paneindex = new Dictionary<string, int>();
         foreach (Module module in modules)
         {
@@ -358,62 +352,80 @@
             if (moduledefinition != null)
             {
                 string typename = moduledefinition.ControlTypeTemplate;
-                if (moduledefinition.ControlTypeRoutes != "")
+                if (module.ModuleId == moduleid && control != "")
                 {
-                    foreach (string route in moduledefinition.ControlTypeRoutes.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
+                    // check if the module defines custom routes
+                    if (moduledefinition.ControlTypeRoutes != "")
                     {
-                        if (route.StartsWith(control + "="))
+                        foreach (string route in moduledefinition.ControlTypeRoutes.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
                         {
-                            typename = route.Replace(control + "=", "");
+                            if (route.StartsWith(control + "="))
+                            {
+                                typename = route.Replace(control + "=", "");
+                            }
+                        }
+                    }
+                    module.ModuleType = typename.Replace("{Control}", control);
+
+                    // admin controls need to load additional metadata from the IModuleControl interface
+                    if (moduleid == module.ModuleId)
+                    {
+                        typename = module.ModuleType;
+                        // check for core module actions component
+                        if (Constants.DefaultModuleActions.Contains(control))
+                        {
+                            typename = Constants.DefaultModuleActionsTemplate.Replace("{Control}", control);
+                        }
+                        Type moduletype = Type.GetType(typename);
+                        if (moduletype != null)
+                        {
+                            var moduleobject = Activator.CreateInstance(moduletype);
+                            module.SecurityAccessLevel = (SecurityAccessLevel)moduletype.GetProperty("SecurityAccessLevel").GetValue(moduleobject, null);
+                            module.ControlTitle = (string)moduletype.GetProperty("Title").GetValue(moduleobject);
+                            module.Actions = (string)moduletype.GetProperty("Actions").GetValue(moduleobject);
+                            module.UseAdminContainer = (bool)moduletype.GetProperty("UseAdminContainer").GetValue(moduleobject);
                         }
                     }
                 }
-                module.ModuleType = typename.Replace("{Control}", control);
-
-                // get IModuleControl properties
-                typename = module.ModuleType;
-                // check for core module actions component
-                if (Constants.DefaultModuleActions.Contains(control))
+                else
                 {
-                    typename = Constants.DefaultModuleActionsTemplate.Replace("{Control}", control);
+                    module.ModuleType = typename.Replace("{Control}", Constants.DefaultControl);
                 }
-                Type moduletype = Type.GetType(typename);
-                if (moduletype != null)
+
+            }
+
+            if (module.PageId == pageid)
+            {
+                // ensure module's pane exists in current page and if not, assign it to the Admin pane
+                if (!panes.ToLower().Contains(module.Pane.ToLower()))
                 {
-                    var moduleobject = Activator.CreateInstance(moduletype);
-                    module.SecurityAccessLevel = (SecurityAccessLevel)moduletype.GetProperty("SecurityAccessLevel").GetValue(moduleobject, null);
-                    module.ControlTitle = (string)moduletype.GetProperty("Title").GetValue(moduleobject);
-                    module.Actions = (string)moduletype.GetProperty("Actions").GetValue(moduleobject);
-                    module.UseAdminContainer = (bool)moduletype.GetProperty("UseAdminContainer").GetValue(moduleobject);
+                    module.Pane = Constants.AdminPane;
                 }
-            }
 
-            // ensure module's pane exists in current page and if not, assign it to the Admin pane
-            if (!panes.ToLower().Contains(module.Pane.ToLower()))
-            {
-                module.Pane = Constants.AdminPane;
+                // calculate module position within pane
+                if (paneindex.ContainsKey(module.Pane))
+                {
+                    paneindex[module.Pane] += 1;
+                }
+                else
+                {
+                    paneindex.Add(module.Pane, 0);
+                }
+                module.PaneModuleIndex = paneindex[module.Pane];
             }
 
-            // calculate module position within pane
-            if (paneindex.ContainsKey(module.Pane))
-            {
-                paneindex[module.Pane] += 1;
-            }
-            else
-            {
-                paneindex.Add(module.Pane, 0);
-            }
-            module.PaneModuleIndex = paneindex[module.Pane];
-
             if (string.IsNullOrEmpty(module.ContainerType))
             {
-                module.ContainerType = site.DefaultContainerType;
+                module.ContainerType = defaultcontainertype;
             }
         }
 
         foreach (Module module in modules)
         {
-            module.PaneModuleCount = paneindex[module.Pane] + 1;
+            if (module.PageId == pageid)
+            {
+                module.PaneModuleCount = paneindex[module.Pane] + 1;
+            }
         }
         return modules;
     }
diff --git a/Oqtane.Client/Themes/Controls/ControlPanel.razor b/Oqtane.Client/Themes/Controls/ControlPanel.razor
index 9f0a1b1a..c370012b 100644
--- a/Oqtane.Client/Themes/Controls/ControlPanel.razor
+++ b/Oqtane.Client/Themes/Controls/ControlPanel.razor
@@ -152,7 +152,6 @@
     string moduleid = "";
     List<Module> modules = new List<Module>();
     Dictionary<string, string> containers = new Dictionary<string, string>();
-    int pagemanagementmoduleid = -1;
     string moduledefinitionname = "";
     string pane = "";
     string title = "";
@@ -162,7 +161,7 @@
     string cardclass = "text-white bg-secondary";
     string message = "";
 
-    protected override async Task OnParametersSetAsync()
+    protected override void OnParametersSet()
     {
         if (!string.IsNullOrEmpty(ButtonClass))
         {
@@ -200,11 +199,6 @@
             pane = panes.Count() == 1 ? panes.SingleOrDefault() : "";
             containers = ThemeService.GetContainerTypes(PageState.Themes);
             containertype = PageState.Site.DefaultContainerType;
-            List<Module> modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId, Constants.PageManagementModule);
-            if (modules.Count > 0)
-            {
-                pagemanagementmoduleid = modules.FirstOrDefault().ModuleId;
-            }
         }
     }
 
@@ -223,12 +217,12 @@
         StateHasChanged();
     }
 
-    private async Task PageChanged(ChangeEventArgs e)
+    private void PageChanged(ChangeEventArgs e)
     {
         string pageid = (string)e.Value;
         if (pageid != "")
         {
-            foreach(Module module in await ModuleService.GetModulesAsync(int.Parse(pageid)))
+            foreach(Module module in PageState.Modules.Where(item => item.PageId == int.Parse(pageid)))
             {
                 if (UserSecurity.IsAuthorized(PageState.User, "View", module.Permissions))
                 {
@@ -287,27 +281,6 @@
         }
     }
 
-    private string PageUrl(string action)
-    {
-        string url = "";
-        if (pagemanagementmoduleid != -1)
-        {
-            switch (action)
-            {
-                case "Add":
-                    url = EditUrl("admin/pages", pagemanagementmoduleid, action, "");
-                    break;
-                case "Edit":
-                    url = EditUrl("admin/pages", pagemanagementmoduleid, action, "id=" + PageState.Page.PageId.ToString());
-                    break;
-                case "Delete":
-                    url = EditUrl("admin/pages", pagemanagementmoduleid, action, "id=" + PageState.Page.PageId.ToString());
-                    break;
-            }
-        }
-        return url;
-    }
-
     private void EditMode()
     {
         if (UserSecurity.IsAuthorized(PageState.User, "Edit", PageState.Page.Permissions))
@@ -343,15 +316,42 @@
     private void Navigate(string location)
     {
         HideControlPanel();
+        Module module;
         switch (location)
         {
             case "Admin":
-                NavigationManager.NavigateTo(NavigateUrl("admin"));
+                // get admin dashboard moduleid
+                module = PageState.Modules.Where(item => item.ModuleDefinitionName == Constants.AdminDashboardModule).FirstOrDefault();
+                if (module != null)
+                {
+                    NavigationManager.NavigateTo(EditUrl(PageState.Page.Path, module.ModuleId, "Index", ""));
+                }
                 break;
             case "Add":
             case "Edit":
             case "Delete":
-                NavigationManager.NavigateTo(PageUrl(location));
+                string url = "";
+                // get page management moduleid
+                module = PageState.Modules.Where(item => item.ModuleDefinitionName == Constants.PageManagementModule).FirstOrDefault();
+                if (module != null)
+                {
+                    switch (location)
+                    {
+                        case "Add":
+                            url = EditUrl(PageState.Page.Path, module.ModuleId, location, "");
+                            break;
+                        case "Edit":
+                            url = EditUrl(PageState.Page.Path, module.ModuleId, location, "id=" + PageState.Page.PageId.ToString());
+                            break;
+                        case "Delete":
+                            url = EditUrl(PageState.Page.Path, module.ModuleId, location, "id=" + PageState.Page.PageId.ToString());
+                            break;
+                    }
+                }
+                if (url != "")
+                {
+                    NavigationManager.NavigateTo(url);
+                }
                 break;
         }
     }
diff --git a/Oqtane.Server/Controllers/ModuleController.cs b/Oqtane.Server/Controllers/ModuleController.cs
index 98cc0567..e1defb0c 100644
--- a/Oqtane.Server/Controllers/ModuleController.cs
+++ b/Oqtane.Server/Controllers/ModuleController.cs
@@ -29,41 +29,33 @@ namespace Oqtane.Controllers
             this.ServiceProvider = ServiceProvider;
         }
 
-        // GET: api/<controller>?pageid=x
-        // GET: api/<controller>?siteid=x&moduledefinitionname=x
+        // GET: api/<controller>?siteid=x
         [HttpGet]
-        public IEnumerable<Models.Module> Get(string pageid, string siteid, string moduledefinitionname)
+        public IEnumerable<Models.Module> Get(string siteid)
         {
-            if (!string.IsNullOrEmpty(pageid))
+            List<Models.Module> modulelist = new List<Models.Module>();
+            foreach (PageModule pagemodule in PageModules.GetPageModules(int.Parse(siteid)))
             {
-                List<Models.Module> modulelist = new List<Models.Module>();
-                foreach (PageModule pagemodule in PageModules.GetPageModules(int.Parse(pageid)))
-                {
-                    Models.Module module = new Models.Module();
-                    module.SiteId = pagemodule.Module.SiteId;
-                    module.ModuleDefinitionName = pagemodule.Module.ModuleDefinitionName;
-                    module.Permissions = pagemodule.Module.Permissions;
-                    module.CreatedBy = pagemodule.Module.CreatedBy;
-                    module.CreatedOn = pagemodule.Module.CreatedOn;
-                    module.ModifiedBy = pagemodule.Module.ModifiedBy;
-                    module.ModifiedOn = pagemodule.Module.ModifiedOn;
-                    module.IsDeleted = pagemodule.IsDeleted;
+                Models.Module module = new Models.Module();
+                module.SiteId = pagemodule.Module.SiteId;
+                module.ModuleDefinitionName = pagemodule.Module.ModuleDefinitionName;
+                module.Permissions = pagemodule.Module.Permissions;
+                module.CreatedBy = pagemodule.Module.CreatedBy;
+                module.CreatedOn = pagemodule.Module.CreatedOn;
+                module.ModifiedBy = pagemodule.Module.ModifiedBy;
+                module.ModifiedOn = pagemodule.Module.ModifiedOn;
+                module.IsDeleted = pagemodule.IsDeleted;
 
-                    module.PageModuleId = pagemodule.PageModuleId;
-                    module.ModuleId = pagemodule.ModuleId;
-                    module.PageId = pagemodule.PageId;
-                    module.Title = pagemodule.Title;
-                    module.Pane = pagemodule.Pane;
-                    module.Order = pagemodule.Order;
-                    module.ContainerType = pagemodule.ContainerType;
-                    modulelist.Add(module);
-                }
-                return modulelist;
-            }
-            else
-            {
-                return Modules.GetModules(int.Parse(siteid), moduledefinitionname);
+                module.PageModuleId = pagemodule.PageModuleId;
+                module.ModuleId = pagemodule.ModuleId;
+                module.PageId = pagemodule.PageId;
+                module.Title = pagemodule.Title;
+                module.Pane = pagemodule.Pane;
+                module.Order = pagemodule.Order;
+                module.ContainerType = pagemodule.ContainerType;
+                modulelist.Add(module);
             }
+            return modulelist;
         }
 
         // GET api/<controller>/5
diff --git a/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs b/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs
index 9e9cde33..d7ed6251 100644
--- a/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs
@@ -6,7 +6,6 @@ namespace Oqtane.Repository
     public interface IModuleRepository
     {
         IEnumerable<Module> GetModules();
-        IEnumerable<Module> GetModules(int SiteId, string ModuleDefinitionName);
         Module AddModule(Module Module);
         Module UpdateModule(Module Module);
         Module GetModule(int ModuleId);
diff --git a/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs b/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs
index a1fccef8..42b46dc0 100644
--- a/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs
@@ -6,7 +6,7 @@ namespace Oqtane.Repository
     public interface IPageModuleRepository
     {
         IEnumerable<PageModule> GetPageModules();
-        IEnumerable<PageModule> GetPageModules(int PageId);
+        IEnumerable<PageModule> GetPageModules(int SiteId);
         PageModule AddPageModule(PageModule PageModule);
         PageModule UpdatePageModule(PageModule PageModule);
         PageModule GetPageModule(int PageModuleId);
diff --git a/Oqtane.Server/Repository/ModuleRepository.cs b/Oqtane.Server/Repository/ModuleRepository.cs
index f9a71d29..c800e790 100644
--- a/Oqtane.Server/Repository/ModuleRepository.cs
+++ b/Oqtane.Server/Repository/ModuleRepository.cs
@@ -21,19 +21,6 @@ namespace Oqtane.Repository
             return db.Module;
         }
 
-        public IEnumerable<Module> GetModules(int SiteId, string ModuleDefinitionName)
-        {
-            IEnumerable<Permission> permissions = Permissions.GetPermissions(SiteId, "Module").ToList();
-            IEnumerable<Module> modules = db.Module
-                .Where(item => item.SiteId == SiteId)
-                .Where(item => item.ModuleDefinitionName == ModuleDefinitionName);
-            foreach (Module module in modules)
-            {
-                module.Permissions = Permissions.EncodePermissions(module.ModuleId, permissions);
-            }
-            return modules;
-        }
-
         public Module AddModule(Module Module)
         {
             db.Module.Add(Module);
diff --git a/Oqtane.Server/Repository/PageModuleRepository.cs b/Oqtane.Server/Repository/PageModuleRepository.cs
index 9eb829d1..66d3a0d5 100644
--- a/Oqtane.Server/Repository/PageModuleRepository.cs
+++ b/Oqtane.Server/Repository/PageModuleRepository.cs
@@ -20,10 +20,11 @@ namespace Oqtane.Repository
         {
             return db.PageModule;
         }
-        public IEnumerable<PageModule> GetPageModules(int PageId)
+        public IEnumerable<PageModule> GetPageModules(int SiteId)
         {
-            IEnumerable<PageModule> pagemodules = db.PageModule.Where(item => item.PageId == PageId)
-                .Include(item => item.Module); // eager load modules
+            IEnumerable<PageModule> pagemodules = db.PageModule
+                .Include(item => item.Module) // eager load modules
+                .Where(item => item.Module.SiteId == SiteId);
             if (pagemodules != null && pagemodules.Any())
             {
                 IEnumerable<Permission> permissions = Permissions.GetPermissions(pagemodules.FirstOrDefault().Module.SiteId, "Module").ToList();
diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs
index 7dd3a554..6fcb02e2 100644
--- a/Oqtane.Server/Repository/SiteRepository.cs
+++ b/Oqtane.Server/Repository/SiteRepository.cs
@@ -35,7 +35,7 @@ namespace Oqtane.Repository
 
             // define the default site template
             SiteTemplate = new List<PageTemplate>();
-            SiteTemplate.Add(new PageTemplate { Name = "Home", Parent = "", Path = "", Order = 1, Icon = "home", IsNavigation = true, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
+            SiteTemplate.Add(new PageTemplate { Name = "Home", Parent = "", Path = "", Icon = "home", IsNavigation = true, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Welcome To Oqtane...", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]",  
                     Content = "<p><a href=\"https://www.oqtane.org\" target=\"_new\">Oqtane</a> is an open source <b>modular application framework</b> built from the ground up using modern .NET Core technology. It leverages the revolutionary new Blazor component model to create a <b>fully dynamic</b> web development experience which can be executed on a client or server. Whether you are looking for a platform to <b>accelerate your web development</b> efforts, or simply interested in exploring the anatomy of a large-scale Blazor application, Oqtane provides a solid foundation based on proven enterprise architectural principles.</p>" +
                     "<p align=\"center\"><a href=\"https://www.oqtane.org\" target=\"_new\"><img src=\"oqtane.png\"></a><br /><br /><a class=\"btn btn-primary\" href=\"https://www.oqtane.org/Community\" target=\"_new\">Join Our Community</a>&nbsp;&nbsp;<a class=\"btn btn-primary\" href=\"https://github.com/oqtane/oqtane.framework\" target=\"_new\">Clone Our Repo</a><br /><br /></p>" +
@@ -50,43 +50,43 @@ namespace Oqtane.Repository
                 }
             }
             }); 
-            SiteTemplate.Add(new PageTemplate { Name = "Admin", Parent = "", Path = "admin", Order = 1, Icon = "", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Dashboard, Oqtane.Client", Title = "Administration", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
+            SiteTemplate.Add(new PageTemplate { Name = "Admin", Parent = "", Path = "admin", Icon = "", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
+                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Dashboard, Oqtane.Client", Title = "Admin Dashboard", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
-            SiteTemplate.Add(new PageTemplate { Name = "Site Management", Parent = "Admin", Path = "admin/sites", Order = 1, Icon = "globe", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
+            SiteTemplate.Add(new PageTemplate { Name = "Site Management", Parent = "Admin", Path = "admin/sites", Icon = "globe", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Sites, Oqtane.Client", Title = "Site Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
-            SiteTemplate.Add(new PageTemplate { Name = "Page Management", Parent = "Admin", Path = "admin/pages", Order = 1, Icon = "layers", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
+            SiteTemplate.Add(new PageTemplate { Name = "Page Management", Parent = "Admin", Path = "admin/pages", Icon = "layers", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Pages, Oqtane.Client", Title = "Page Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
-            SiteTemplate.Add(new PageTemplate { Name = "File Management", Parent = "Admin", Path = "admin/files", Order = 1, Icon = "file", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
+            SiteTemplate.Add(new PageTemplate { Name = "File Management", Parent = "Admin", Path = "admin/files", Icon = "file", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Files, Oqtane.Client", Title = "File Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
-            SiteTemplate.Add(new PageTemplate { Name = "User Management", Parent = "Admin", Path = "admin/users", Order = 1, Icon = "person", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
+            SiteTemplate.Add(new PageTemplate { Name = "User Management", Parent = "Admin", Path = "admin/users", Icon = "person", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Users, Oqtane.Client", Title = "User Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
-            SiteTemplate.Add(new PageTemplate { Name = "Role Management", Parent = "Admin", Path = "admin/roles", Order = 1, Icon = "lock-locked", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
+            SiteTemplate.Add(new PageTemplate { Name = "Role Management", Parent = "Admin", Path = "admin/roles", Icon = "lock-locked", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Roles, Oqtane.Client", Title = "Role Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
-            SiteTemplate.Add(new PageTemplate { Name = "Tenant Management", Parent = "Admin", Path = "admin/tenants", Order = 1, Icon = "list", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
+            SiteTemplate.Add(new PageTemplate { Name = "Tenant Management", Parent = "Admin", Path = "admin/tenants", Icon = "list", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Tenants, Oqtane.Client", Title = "Tenant Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
-            SiteTemplate.Add(new PageTemplate { Name = "Module Management", Parent = "Admin", Path = "admin/modules", Order = 1, Icon = "browser", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
+            SiteTemplate.Add(new PageTemplate { Name = "Module Management", Parent = "Admin", Path = "admin/modules", Icon = "browser", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.ModuleDefinitions, Oqtane.Client", Title = "Module Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
-            SiteTemplate.Add(new PageTemplate { Name = "Theme Management", Parent = "Admin", Path = "admin/themes", Order = 1, Icon = "brush", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
+            SiteTemplate.Add(new PageTemplate { Name = "Theme Management", Parent = "Admin", Path = "admin/themes", Icon = "brush", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Themes, Oqtane.Client", Title = "Theme Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
-            SiteTemplate.Add(new PageTemplate { Name = "Upgrade Service", Parent = "Admin", Path = "admin/upgrade", Order = 1, Icon = "aperture", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
+            SiteTemplate.Add(new PageTemplate { Name = "Upgrade Service", Parent = "Admin", Path = "admin/upgrade", Icon = "aperture", IsNavigation = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Upgrade, Oqtane.Client", Title = "Upgrade Service", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
-            SiteTemplate.Add(new PageTemplate { Name = "Login", Parent = "", Path = "login", Order = 1, Icon = "lock-locked", IsNavigation = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
+            SiteTemplate.Add(new PageTemplate { Name = "Login", Parent = "", Path = "login", Icon = "lock-locked", IsNavigation = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Login, Oqtane.Client", Title = "User Login", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
-            SiteTemplate.Add(new PageTemplate { Name = "Register", Parent = "", Path = "register", Order = 1, Icon = "person", IsNavigation = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
+            SiteTemplate.Add(new PageTemplate { Name = "Register", Parent = "", Path = "register", Icon = "person", IsNavigation = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Register, Oqtane.Client", Title = "User Registration", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
-            SiteTemplate.Add(new PageTemplate { Name = "Profile", Parent = "", Path = "profile", Order = 1, Icon = "person", IsNavigation = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
+            SiteTemplate.Add(new PageTemplate { Name = "Profile", Parent = "", Path = "profile", Icon = "person", IsNavigation = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
                 new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Profile, Oqtane.Client", Title = "User Profile", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
             }});
         }
@@ -164,7 +164,7 @@ namespace Oqtane.Repository
                     ParentId = parentid,
                     Name = pagetemplate.Name,
                     Path = pagetemplate.Path,
-                    Order = pagetemplate.Order,
+                    Order = 1,
                     IsNavigation = pagetemplate.IsNavigation,
                     EditMode = pagetemplate.EditMode,
                     ThemeType = "",
diff --git a/Oqtane.Shared/Models/PageTemplate.cs b/Oqtane.Shared/Models/PageTemplate.cs
index 4bff3ec2..0e3851df 100644
--- a/Oqtane.Shared/Models/PageTemplate.cs
+++ b/Oqtane.Shared/Models/PageTemplate.cs
@@ -7,7 +7,6 @@ namespace Oqtane.Models
         public string Name { get; set; }
         public string Parent { get; set; }
         public string Path { get; set; }
-        public int Order { get; set; }
         public string Icon { get; set; }
         public bool IsNavigation { get; set; }
         public bool EditMode { get; set; }
diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs
index 125d27b3..d168b592 100644
--- a/Oqtane.Shared/Shared/Constants.cs
+++ b/Oqtane.Shared/Shared/Constants.cs
@@ -13,8 +13,10 @@
         public const string DefaultContainer = "Oqtane.Themes.BlazorTheme.Container, Oqtane.Client";
         public const string DefaultAdminContainer = "Oqtane.Themes.AdminContainer, Oqtane.Client";
 
+        // Default Module Actions are reserved and should not be used by modules
         public static readonly string[] DefaultModuleActions = new[] { "Settings", "Import", "Export" }; 
         public const string DefaultModuleActionsTemplate = "Oqtane.Modules.Admin.Modules.{Control}, Oqtane.Client";
+        public const string AdminDashboardModule = "Oqtane.Modules.Admin.Dashboard, Oqtane.Client";
         public const string PageManagementModule = "Oqtane.Modules.Admin.Pages, Oqtane.Client";
         public const string ModuleMessageControl = "Oqtane.Modules.Controls.ModuleMessage, Oqtane.Client";