diff --git a/Oqtane.Client/App.razor b/Oqtane.Client/App.razor
index bb666be4..9e2793d7 100644
--- a/Oqtane.Client/App.razor
+++ b/Oqtane.Client/App.razor
@@ -1,5 +1,4 @@
 @using Oqtane.Shared
-@using Oqtane.Client.Shared
 @using Oqtane.Services
 @inject IInstallationService InstallationService
 
diff --git a/Oqtane.Client/Modules/Admin/Admin/Index.razor b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor
similarity index 94%
rename from Oqtane.Client/Modules/Admin/Admin/Index.razor
rename to Oqtane.Client/Modules/Admin/Dashboard/Index.razor
index 1717112b..0e2d7fa9 100644
--- a/Oqtane.Client/Modules/Admin/Admin/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor
@@ -3,7 +3,7 @@
 @using Oqtane.Services
 @using Oqtane.Models;
 @using Oqtane.Security
-@using Oqtane.Client.Modules.Controls
+@namespace Oqtane.Modules.Admin.Dashboard
 @inherits ModuleBase
 @inject IPageService PageService
 @inject IUserService UserService
@@ -22,7 +22,8 @@
         }
     }
 </ul>
-<br /><br />
+<br />
+<br />
 
 @code {
     List<Page> pages;
diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor
index 5f852efa..2f24c684 100644
--- a/Oqtane.Client/Modules/Admin/Login/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Login/Index.razor
@@ -5,6 +5,7 @@
 @using Oqtane.Services
 @using Oqtane.Providers
 @using Oqtane.Shared
+@namespace Oqtane.Modules.Admin.Login
 @inherits ModuleBase
 @inject IUriHelper UriHelper
 @inject IJSRuntime jsRuntime
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
index 9050489e..49980307 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
@@ -1,8 +1,9 @@
 @using Microsoft.AspNetCore.Components.Routing
-@using Oqtane.Client.Modules.Controls
+@using Oqtane.Modules.Controls
 @using Oqtane.Modules
 @using Oqtane.Services
 @using Oqtane.Shared
+@namespace Oqtane.Modules.Admin.ModuleDefinitions
 @inherits ModuleBase
 @inject IUriHelper UriHelper
 @inject IFileService FileService
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
index 9b21ba5e..53ad0d55 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
@@ -1,9 +1,9 @@
 @using Oqtane.Services
 @using Oqtane.Models
 @using Oqtane.Modules
-@using Oqtane.Client.Modules.Controls
+@using Oqtane.Modules.Controls
+@namespace Oqtane.Modules.Admin.ModuleDefinitions
 @inherits ModuleBase
-
 @inject IModuleDefinitionService ModuleDefinitionService
 
 @if (moduledefinitions == null)
diff --git a/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor b/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
index 90fb186e..b57abb63 100644
--- a/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
@@ -4,7 +4,8 @@
 @using Oqtane.Modules
 @using Oqtane.Shared
 @using Oqtane.Security
-@using Oqtane.Client.Modules.Controls
+@using Oqtane.Modules.Controls
+@namespace Oqtane.Modules.Admin.ModuleSettings
 @inherits ModuleBase
 @inject IUriHelper UriHelper
 @inject IThemeService ThemeService
diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor
index 606e1f1b..f67b9184 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor
@@ -1,10 +1,11 @@
 @using Microsoft.AspNetCore.Components.Routing
-@using Oqtane.Client.Modules.Controls
+@using Oqtane.Modules.Controls
 @using Oqtane.Models
 @using Oqtane.Services
 @using Oqtane.Modules
 @using Oqtane.Shared
 @using Oqtane.Security
+@namespace Oqtane.Modules.Admin.Pages
 @inherits ModuleBase
 @inject IUriHelper UriHelper
 @inject IPageService PageService
@@ -21,34 +22,44 @@
             <input class="form-control" @bind="@name" />
         </td>
     </tr>
-    <tr>
-        <td>
-            <label for="Name" class="control-label">Path: </label>
-        </td>
-        <td>
-            <input class="form-control" @bind="@path" />
-        </td>
-    </tr>
     <tr>
         <td>
             <label for="Name" class="control-label">Parent: </label>
         </td>
         <td>
-            <select class="form-control" @bind="@parentid">
-                <option value="">&lt;Select Parent&gt;</option>
-                @foreach (Page page in PageState.Pages)
+            <select class="form-control" @onchange="@(e => ParentChanged(e))">
+                <option value="">&lt;Site Root&gt;</option>
+                @foreach (Page page in pages)
                 {
-                    <option value="@(page.PageId)">@(page.Name)</option>
+                    <option value="@(page.PageId)">@(new string('-',page.Level * 2))@(page.Name)</option>
                 }
             </select>
         </td>
     </tr>
     <tr>
         <td>
-            <label for="Name" class="control-label">Order: </label>
+            <label for="Name" class="control-label">Insert: </label>
         </td>
         <td>
-            <input class="form-control" @bind="@order" />
+            <select class="form-control" @bind="@insert">
+                <option value="<<">At Beginning</option>
+                @if (children != null && children.Count > 0)
+                {
+                    <option value="<">Before</option>
+                    <option value=">">After</option>
+                }
+                <option value=">>" selected>At End</option>
+            </select>
+            @if (children != null && children.Count > 0 && (insert == "<" || insert == ">"))
+            {
+                <select class="form-control" @bind="@childid">
+                    <option value="-1">&lt;Select Page&gt;</option>
+                    @foreach (Page page in children)
+                    {
+                        <option value="@(page.PageId)">@(page.Name)</option>
+                    }
+                </select>
+            }
         </td>
     </tr>
     <tr>
@@ -129,10 +140,12 @@
     Dictionary<string, string> themes = new Dictionary<string, string>();
     Dictionary<string, string> panelayouts = new Dictionary<string, string>();
 
+    List<Page> pages;
     string name;
-    string path;
     string parentid;
-    string order = "";
+    string insert;
+    List<Page> children;
+    int childid = -1;
     string isnavigation = "True";
     string editmode = "False";
     string themetype;
@@ -146,6 +159,9 @@
     {
         try
         {
+            pages = PageState.Pages.Where(item => item.IsNavigation).ToList();
+            children = PageState.Pages.Where(item => item.ParentId == null && item.IsNavigation).OrderBy(item => item.Order).ToList();
+
             themes = ThemeService.GetThemeTypes(PageState.Themes);
             panelayouts = ThemeService.GetPaneLayoutTypes(PageState.Themes);
 
@@ -160,23 +176,63 @@
         }
     }
 
+    private void ParentChanged(UIChangeEventArgs e)
+    {
+        try
+        {
+            parentid = (string)e.Value;
+            if (string.IsNullOrEmpty(parentid))
+            {
+                children = PageState.Pages.Where(item => item.ParentId == null && item.IsNavigation).OrderBy(item => item.Order).ToList();
+            }
+            else
+            {
+                children = PageState.Pages.Where(item => item.ParentId == int.Parse(parentid) && item.IsNavigation).OrderBy(item => item.Order).ToList();
+            }
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            message = ex.Message;
+        }
+    }
+
     private async Task SavePage()
     {
         try
         {
             Page page = new Page();
             page.SiteId = PageState.Page.SiteId;
+            page.Name = name;
             if (string.IsNullOrEmpty(parentid))
             {
                 page.ParentId = null;
+                page.Path = page.Name.ToLower();
             }
             else
             {
                 page.ParentId = Int32.Parse(parentid);
+                Page parent = PageState.Pages.Where(item => item.ParentId == page.ParentId).FirstOrDefault();
+                page.Path = parent.Path + "/" + page.Name.ToLower();
+            }
+            Page child;
+            switch (insert)
+            {
+                case "<<":
+                    page.Order = 0;
+                    break;
+                case "<":
+                    child = PageState.Pages.Where(item => item.PageId == childid).FirstOrDefault();
+                    page.Order = child.Order - 1;
+                    break;
+                case ">":
+                    child = PageState.Pages.Where(item => item.PageId == childid).FirstOrDefault();
+                    page.Order = child.Order + 1;
+                    break;
+                case ">>":
+                    page.Order = int.MaxValue;
+                    break;
             }
-            page.Name = name;
-            page.Path = path;
-            page.Order = (order == null ? 1 : Int32.Parse(order));
             page.IsNavigation = (isnavigation == null ? true : Boolean.Parse(isnavigation));
             page.EditMode = (editmode == null ? true : Boolean.Parse(editmode));
             page.ThemeType = themetype;
@@ -195,20 +251,15 @@
             page.Panes = (string)property.GetValue(Activator.CreateInstance(type), null);
             page.Permissions = permissiongrid.GetPermissions();
             await PageService.AddPageAsync(page);
+            await PageService.UpdatePageOrderAsync(page.SiteId, page.ParentId);
 
             PageState.Reload = Constants.ReloadSite;
-            if (PageState.Page.Name == "Page Management")
-            {
-                UriHelper.NavigateTo(NavigateUrl());
-            }
-            else
-            {
-                UriHelper.NavigateTo(NavigateUrl(path));
-            }
+            UriHelper.NavigateTo(NavigateUrl());
         }
         catch (Exception ex)
         {
             message = ex.Message;
         }
     }
+
 }
diff --git a/Oqtane.Client/Modules/Admin/Pages/Delete.razor b/Oqtane.Client/Modules/Admin/Pages/Delete.razor
index 40749f3b..932597c9 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Delete.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Delete.razor
@@ -1,10 +1,11 @@
 @using Microsoft.AspNetCore.Components.Routing
-@using Oqtane.Client.Modules.Controls
+@using Oqtane.Modules.Controls
 @using Oqtane.Models
 @using Oqtane.Services
 @using Oqtane.Modules
 @using Oqtane.Shared
 @using Oqtane.Security
+@namespace Oqtane.Modules.Admin.Pages
 @inherits ModuleBase
 @inject IUriHelper UriHelper
 @inject IPageService PageService
@@ -43,14 +44,6 @@
             </select>
         </td>
     </tr>
-    <tr>
-        <td>
-            <label for="Name" class="control-label">Order: </label>
-        </td>
-        <td>
-            <input class="form-control" @bind="@order" readonly />
-        </td>
-    </tr>
     <tr>
         <td>
             <label for="Name" class="control-label">Navigation? </label>
@@ -136,7 +129,6 @@
     string name;
     string path;
     string parentid;
-    string order;
     string isnavigation;
     string editmode;
     string themetype;
@@ -163,8 +155,6 @@
             {
                 name = page.Name;
                 path = page.Path;
-
-                order = page.Order.ToString();
                 isnavigation = page.IsNavigation.ToString();
                 editmode = page.EditMode.ToString();
                 themetype = page.ThemeType;
diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
index 3b25fb35..ad5ee932 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
@@ -1,10 +1,11 @@
 @using Microsoft.AspNetCore.Components.Routing
-@using Oqtane.Client.Modules.Controls
+@using Oqtane.Modules.Controls
 @using Oqtane.Models
 @using Oqtane.Services
 @using Oqtane.Modules
 @using Oqtane.Shared
 @using Oqtane.Security
+@namespace Oqtane.Modules.Admin.Pages
 @inherits ModuleBase
 @inject IUriHelper UriHelper
 @inject IPageService PageService
@@ -26,7 +27,7 @@
             <label for="Name" class="control-label">Path: </label>
         </td>
         <td>
-            <input class="form-control" @bind="@path" />
+            <input class="form-control" @bind="@path" readonly />
         </td>
     </tr>
     <tr>
@@ -34,21 +35,40 @@
             <label for="Name" class="control-label">Parent: </label>
         </td>
         <td>
-            <select class="form-control" @bind="@parentid">
-                <option value="">&lt;Select Parent&gt;</option>
-                @foreach (Page page in PageState.Pages)
+            <select class="form-control" @onchange="@(e => ParentChanged(e))">
+                <option value="">&lt;Site Root&gt;</option>
+                @foreach (Page page in pages)
                 {
-                    <option value="@(page.PageId)">@(page.Name)</option>
+                    <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
                 }
             </select>
         </td>
     </tr>
     <tr>
         <td>
-            <label for="Name" class="control-label">Order: </label>
+            <label for="Name" class="control-label">Move : </label>
         </td>
         <td>
-            <input class="form-control" @bind="@order" />
+            <select class="form-control" @bind="@insert">
+                <option value="">&lt;Maintain Current Location&gt;</option>
+                <option value="<<">To Beginning</option>
+                @if (children != null && children.Count > 0)
+                {
+                    <option value="<">Before</option>
+                    <option value=">">After</option>
+                }
+                <option value=">>" selected>To End</option>
+            </select>
+            @if (children != null && children.Count > 0 && (insert == "<" || insert == ">"))
+            {
+                <select class="form-control" @bind="@childid">
+                    <option value="-1">&lt;Select Page&gt;</option>
+                    @foreach (Page page in children)
+                    {
+                        <option value="@(page.PageId)">@(page.Name)</option>
+                    }
+                </select>
+            }
         </td>
     </tr>
     <tr>
@@ -132,11 +152,14 @@
     Dictionary<string, string> themes = new Dictionary<string, string>();
     Dictionary<string, string> panelayouts = new Dictionary<string, string>();
 
+    List<Page> pages;
     int PageId;
     string name;
     string path;
     string parentid;
-    string order;
+    string insert = "";
+    List<Page> children;
+    int childid = -1;
     string isnavigation;
     string editmode;
     string themetype;
@@ -154,6 +177,9 @@
     {
         try
         {
+            pages = PageState.Pages.Where(item => item.IsNavigation).ToList();
+            children = PageState.Pages.Where(item => item.ParentId == null && item.IsNavigation).OrderBy(item => item.Order).ToList();
+
             themes = ThemeService.GetThemeTypes(PageState.Themes);
             panelayouts = ThemeService.GetPaneLayoutTypes(PageState.Themes);
 
@@ -171,7 +197,6 @@
                 {
                     parentid = page.ParentId.ToString();
                 }
-                order = page.Order.ToString();
                 isnavigation = page.IsNavigation.ToString();
                 editmode = page.EditMode.ToString();
                 themetype = page.ThemeType;
@@ -190,23 +215,67 @@
         }
     }
 
+    private void ParentChanged(UIChangeEventArgs e)
+    {
+        try
+        {
+            parentid = (string)e.Value;
+            if (string.IsNullOrEmpty(parentid))
+            {
+                children = PageState.Pages.Where(item => item.ParentId == null && item.IsNavigation).OrderBy(item => item.Order).ToList();
+            }
+            else
+            {
+                children = PageState.Pages.Where(item => item.ParentId == int.Parse(parentid) && item.IsNavigation).OrderBy(item => item.Order).ToList();
+            }
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            message = ex.Message;
+        }
+    }
+
     private async Task SavePage()
     {
         try
         {
             Page page = PageState.Page;
+            int? currentparentid = page.ParentId;
             page.PageId = Int32.Parse(PageState.QueryString["id"]);
+            page.Name = name;
             if (string.IsNullOrEmpty(parentid))
             {
                 page.ParentId = null;
+                page.Path = page.Name.ToLower();
             }
             else
             {
                 page.ParentId = Int32.Parse(parentid);
+                Page parent = PageState.Pages.Where(item => item.ParentId == page.ParentId).FirstOrDefault();
+                page.Path = parent.Path + "/" + page.Name.ToLower();
+            }
+            if (insert != "")
+            {
+                Page child;
+                switch (insert)
+                {
+                    case "<<":
+                        page.Order = 0;
+                        break;
+                    case "<":
+                        child = PageState.Pages.Where(item => item.PageId == childid).FirstOrDefault();
+                        page.Order = child.Order - 1;
+                        break;
+                    case ">":
+                        child = PageState.Pages.Where(item => item.PageId == childid).FirstOrDefault();
+                        page.Order = child.Order + 1;
+                        break;
+                    case ">>":
+                        page.Order = int.MaxValue;
+                        break;
+                }
             }
-            page.Name = name;
-            page.Path = path;
-            page.Order = (order == null ? 1 : Int32.Parse(order));
             page.IsNavigation = (isnavigation == null ? true : Boolean.Parse(isnavigation));
             page.EditMode = (editmode == null ? true : Boolean.Parse(editmode));
             page.ThemeType = themetype;
@@ -225,16 +294,11 @@
             page.Panes = (string)property.GetValue(Activator.CreateInstance(type), null);
             page.Permissions = permissiongrid.GetPermissions();
             await PageService.UpdatePageAsync(page);
+            await PageService.UpdatePageOrderAsync(page.SiteId, page.ParentId);
+            await PageService.UpdatePageOrderAsync(page.SiteId, currentparentid);
 
             PageState.Reload = Constants.ReloadSite;
-            if (PageState.Page.Name == "Page Management")
-            {
-                UriHelper.NavigateTo(NavigateUrl());
-            }
-            else
-            {
-                UriHelper.NavigateTo(NavigateUrl(path));
-            }
+            UriHelper.NavigateTo(NavigateUrl());
         }
         catch (Exception ex)
         {
diff --git a/Oqtane.Client/Modules/Admin/Pages/Index.razor b/Oqtane.Client/Modules/Admin/Pages/Index.razor
index 7f4c861b..1d765897 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Index.razor
@@ -1,15 +1,12 @@
-@using Oqtane.Client.Modules.Controls
+@using Oqtane.Modules.Controls
 @using Oqtane.Services
 @using Oqtane.Models
 @using Oqtane.Modules
+@using Oqtane.Shared
+@namespace Oqtane.Modules.Admin.Pages
 @inherits ModuleBase
-@inject IPageService PageService
 
-@if (PageState.Pages == null)
-{
-    <p><em>Loading...</em></p>
-}
-else
+@if (PageState.Pages != null)
 {
     <ActionLink Action="Add" Text="Add Page" />
     <table class="table table-borderless">
@@ -17,7 +14,6 @@ else
             <tr>
                 <th>&nbsp;</th>
                 <th>&nbsp;</th>
-                <th>Path</th>
                 <th>Name</th>
             </tr>
         </thead>
@@ -27,14 +23,14 @@ else
                 <tr>
                     <td><ActionLink Action="Edit" Parameters="@($"id=" + page.PageId.ToString())" /></td>
                     <td><ActionLink Action="Delete" Parameters="@($"id=" + page.PageId.ToString())" Class="btn btn-danger" /></td>
-                    <td>@(page.Path)</td>
-                    <td>@(page.Name)</td>
+                    <td>@(new string('-', page.Level * 2))@(page.Name)</td>
                 </tr>
             }
         </tbody>
-    </table> 
+    </table>
+
 }
 
 @code {
     public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
-}
\ No newline at end of file
+}
diff --git a/Oqtane.Client/Modules/Admin/Profile/Index.razor b/Oqtane.Client/Modules/Admin/Profile/Index.razor
index 5139bd11..3aebe474 100644
--- a/Oqtane.Client/Modules/Admin/Profile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Profile/Index.razor
@@ -1,8 +1,9 @@
 @using Microsoft.AspNetCore.Components.Routing
-@using Oqtane.Client.Modules.Controls
+@using Oqtane.Modules.Controls
 @using Oqtane.Modules
 @using Oqtane.Models
 @using Oqtane.Services
+@namespace Oqtane.Modules.Admin.Profile
 @inherits ModuleBase
 @inject IUriHelper UriHelper
 @inject IUserService UserService
diff --git a/Oqtane.Client/Modules/Admin/Register/Index.razor b/Oqtane.Client/Modules/Admin/Register/Index.razor
index 3ef9ed16..c9708440 100644
--- a/Oqtane.Client/Modules/Admin/Register/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Register/Index.razor
@@ -2,6 +2,7 @@
 @using Oqtane.Modules
 @using Oqtane.Models
 @using Oqtane.Services
+@namespace Oqtane.Modules.Admin.Register
 @inherits ModuleBase
 @inject IUriHelper UriHelper
 @inject IUserService UserService
diff --git a/Oqtane.Client/Modules/Admin/Roles/Index.razor b/Oqtane.Client/Modules/Admin/Roles/Index.razor
index 012f2052..f6c55e8e 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Index.razor
@@ -1,7 +1,8 @@
 @using Oqtane.Services
 @using Oqtane.Models
 @using Oqtane.Modules
-@using Oqtane.Client.Modules.Controls
+@using Oqtane.Modules.Controls
+@namespace Oqtane.Modules.Admin.Roles
 @inherits ModuleBase
 @inject IRoleService RoleService
 
diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor
index d55e955f..f71372b9 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor
@@ -4,6 +4,7 @@
 @using Oqtane.Modules
 @using Oqtane.Shared
 @using Oqtane.Security
+@namespace Oqtane.Modules.Admin.Sites
 @inherits ModuleBase
 @inject IUriHelper UriHelper
 @inject ITenantService TenantService
@@ -13,52 +14,52 @@
 
 @if (tenants == null)
 {
-<p><em>Loading...</em></p>
+    <p><em>Loading...</em></p>
 }
 else
 {
-<table class="table table-borderless">
-    <tr>
-        <td>
-            <label for="Name" class="control-label">Tenant: </label>
-        </td>
-        <td>
-            <select class="form-control" @bind="@tenantid">
-                <option value="">&lt;Select Tenant&gt;</option>
-                @foreach (Tenant tenant in tenants)
-                {
-                <option value="@tenant.TenantId">@tenant.Name</option>
-                }
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <label for="Name" class="control-label">Name: </label>
-        </td>
-        <td>
-            <input class="form-control" @bind="@name" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <label for="Name" class="control-label">Alias: </label>
-        </td>
-        <td>
-            <input class="form-control" @bind="@url" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <label for="Name" class="control-label">Logo: </label>
-        </td>
-        <td>
-            <input class="form-control" @bind="@logo" />
-        </td>
-    </tr>
-</table>
-<button type="button" class="btn btn-success" @onclick="@SaveSite">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+    <table class="table table-borderless">
+        <tr>
+            <td>
+                <label for="Name" class="control-label">Tenant: </label>
+            </td>
+            <td>
+                <select class="form-control" @bind="@tenantid">
+                    <option value="">&lt;Select Tenant&gt;</option>
+                    @foreach (Tenant tenant in tenants)
+                    {
+                        <option value="@tenant.TenantId">@tenant.Name</option>
+                    }
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <label for="Name" class="control-label">Name: </label>
+            </td>
+            <td>
+                <input class="form-control" @bind="@name" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <label for="Name" class="control-label">Alias: </label>
+            </td>
+            <td>
+                <input class="form-control" @bind="@url" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <label for="Name" class="control-label">Logo: </label>
+            </td>
+            <td>
+                <input class="form-control" @bind="@logo" />
+            </td>
+        </tr>
+    </table>
+    <button type="button" class="btn btn-success" @onclick="@SaveSite">Save</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 }
 
 @code {
@@ -98,7 +99,7 @@ else
         p.Path = "";
         p.Order = 1;
         p.IsNavigation = true;
-        p.ThemeType = "Oqtane.Client.Themes.Theme1.Theme1, Oqtane.Client"; // TODO: should not hardcode
+        p.ThemeType = PageState.Site.DefaultThemeType;
         p.LayoutType = "";
         p.Icon = "";
         Type type = Type.GetType(p.ThemeType);
diff --git a/Oqtane.Client/Modules/Admin/Sites/Index.razor b/Oqtane.Client/Modules/Admin/Sites/Index.razor
index f80dd108..5520bd54 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Index.razor
@@ -1,7 +1,8 @@
 @using Oqtane.Services
 @using Oqtane.Models
 @using Oqtane.Modules
-@using Oqtane.Client.Modules.Controls
+@using Oqtane.Modules.Controls
+@namespace Oqtane.Modules.Admin.Sites
 @inherits ModuleBase
 
 @inject ISiteService SiteService
diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor
index 34855ec8..0fbdc3ac 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor
@@ -1,6 +1,7 @@
 @using Oqtane.Services
 @using Oqtane.Models
 @using Oqtane.Modules
+@namespace Oqtane.Modules.Admin.Themes
 @inherits ModuleBase
 
 @inject IThemeService ThemeService
diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor
index 481e0ae4..b5e54377 100644
--- a/Oqtane.Client/Modules/Admin/Users/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Index.razor
@@ -1,7 +1,8 @@
 @using Oqtane.Services
 @using Oqtane.Models
 @using Oqtane.Modules
-@using Oqtane.Client.Modules.Controls
+@using Oqtane.Modules.Controls
+@namespace Oqtane.Modules.Admin.Users
 @inherits ModuleBase
 
 @inject IUserService UserService
diff --git a/Oqtane.Client/Modules/Controls/ActionLink.razor b/Oqtane.Client/Modules/Controls/ActionLink.razor
index 264a02bd..f1e8c6ce 100644
--- a/Oqtane.Client/Modules/Controls/ActionLink.razor
+++ b/Oqtane.Client/Modules/Controls/ActionLink.razor
@@ -3,6 +3,7 @@
 @using Oqtane.Services
 @using Oqtane.Shared
 @using Oqtane.Security
+@namespace Oqtane.Modules.Controls
 @inherits ModuleBase
 @inject IUserService UserService
 
diff --git a/Oqtane.Client/Modules/Controls/AuditInfo.razor b/Oqtane.Client/Modules/Controls/AuditInfo.razor
index f03a832b..bba7d0ba 100644
--- a/Oqtane.Client/Modules/Controls/AuditInfo.razor
+++ b/Oqtane.Client/Modules/Controls/AuditInfo.razor
@@ -1,7 +1,11 @@
 @using Oqtane.Modules
+@namespace Oqtane.Modules.Controls
 @inherits ModuleBase
 
-@((MarkupString)@text)
+@if (text != "")
+{
+    @((MarkupString)@text)
+}
 
 @code {
     [Parameter]
@@ -21,8 +25,9 @@
 
     string text = "";
 
-    protected override void OnInitialized()
+    protected override void OnParametersSet()
     {
+        text = "";
         if (!String.IsNullOrEmpty(CreatedBy) || CreatedOn != null)
         {
             text += "<p style=\"" + Style + "\">Created ";
diff --git a/Oqtane.Client/Modules/Controls/FileUpload.razor b/Oqtane.Client/Modules/Controls/FileUpload.razor
index b93de437..6f19a0f5 100644
--- a/Oqtane.Client/Modules/Controls/FileUpload.razor
+++ b/Oqtane.Client/Modules/Controls/FileUpload.razor
@@ -1,4 +1,6 @@
-@if (multiple)
+@namespace Oqtane.Modules.Controls
+
+@if (multiple)
 {
     <input type="file" id="@fileid" name="file" accept="@filter" multiple />
 }
diff --git a/Oqtane.Client/Modules/Controls/ModuleMessage.razor b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
index 5b006331..18b7694e 100644
--- a/Oqtane.Client/Modules/Controls/ModuleMessage.razor
+++ b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
@@ -1,9 +1,12 @@
 @using Oqtane.Modules
+@namespace Oqtane.Modules.Controls
 @inherits ModuleBase
 
 @if (Message != "")
 {
-    <div class="@type">@Message</div><br /><br />
+    <div class="@type">@Message</div>
+    <br />
+    <br />
 }
 
 @code {
@@ -13,7 +16,7 @@
     [Parameter]
     public MessageType Type { get; set; }
 
-    string type = "alert alert-danger"; 
+    string type = "alert alert-danger";
 
     protected override void OnInitialized()
     {
diff --git a/Oqtane.Client/Modules/Controls/PermissionGrid.razor b/Oqtane.Client/Modules/Controls/PermissionGrid.razor
index fa1c9774..0174d1fa 100644
--- a/Oqtane.Client/Modules/Controls/PermissionGrid.razor
+++ b/Oqtane.Client/Modules/Controls/PermissionGrid.razor
@@ -3,6 +3,7 @@
 @using Oqtane.Models
 @using Oqtane.Security
 @using Oqtane.Shared
+@namespace Oqtane.Modules.Controls
 @inherits ModuleBase
 @inject IRoleService RoleService
 @inject IUserService UserService
diff --git a/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor b/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor
index 9c75e34d..c8881f3f 100644
--- a/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor
+++ b/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor
@@ -1,4 +1,6 @@
-<img src="@src" title="@title" disabled=@Disabled @onclick="SetValue" />
+@namespace Oqtane.Modules.Controls
+
+<img src="@src" title="@title" disabled=@Disabled @onclick="SetValue" />
 
 @code {
     [Parameter]
diff --git a/Oqtane.Client/Modules/Counter/Index.razor b/Oqtane.Client/Modules/Counter/Index.razor
index 175aeb38..9b1ef774 100644
--- a/Oqtane.Client/Modules/Counter/Index.razor
+++ b/Oqtane.Client/Modules/Counter/Index.razor
@@ -1,9 +1,11 @@
 @using Oqtane.Modules
+@namespace Oqtane.Modules.Counter
 @inherits ModuleBase
 Current count: @currentCount
 <br />
 <button type="button" class="btn btn-primary" @onclick="@IncrementCount">Click me</button>
-<br /><br />
+<br />
+<br />
 
 @code {
     int currentCount = 0;
diff --git a/Oqtane.Client/Modules/Counter/Module.cs b/Oqtane.Client/Modules/Counter/Module.cs
index c7c95897..972e366f 100644
--- a/Oqtane.Client/Modules/Counter/Module.cs
+++ b/Oqtane.Client/Modules/Counter/Module.cs
@@ -1,7 +1,7 @@
 using Oqtane.Modules;
 using System.Collections.Generic;
 
-namespace Oqtane.Client.Modules.Counter
+namespace Oqtane.Modules.Counter
 {
     public class Module : IModule
     {
diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
index 981ce7fe..2ba17971 100644
--- a/Oqtane.Client/Modules/HtmlText/Edit.razor
+++ b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -1,10 +1,11 @@
 @using Microsoft.AspNetCore.Components.Routing
 @using Oqtane.Modules
-@using Oqtane.Client.Modules.Controls
-@using Oqtane.Client.Modules.HtmlText.Services
-@using Oqtane.Shared.Modules.HtmlText.Models
+@using Oqtane.Modules.Controls
+@using Oqtane.Modules.HtmlText.Services
+@using Oqtane.Modules.HtmlText.Models
 @using System.Net.Http;
 @using Oqtane.Shared;
+@namespace Oqtane.Modules.HtmlText
 @inherits ModuleBase
 @inject IUriHelper UriHelper
 @inject HttpClient http
@@ -24,7 +25,8 @@
 </table>
 <button type="button" class="btn btn-success" @onclick="@SaveContent">Save</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-<br /><br />
+<br />
+<br />
 <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon"></AuditInfo>
 
 @code {
diff --git a/Oqtane.Client/Modules/HtmlText/Index.razor b/Oqtane.Client/Modules/HtmlText/Index.razor
index b635ea9c..c27172b1 100644
--- a/Oqtane.Client/Modules/HtmlText/Index.razor
+++ b/Oqtane.Client/Modules/HtmlText/Index.razor
@@ -1,9 +1,10 @@
-@using Oqtane.Client.Modules.HtmlText.Services
+@using Oqtane.Modules.HtmlText.Services
 @using Oqtane.Modules
-@using Oqtane.Shared.Modules.HtmlText.Models
+@using Oqtane.Modules.HtmlText.Models
 @using System.Net.Http;
-@using Oqtane.Client.Modules.Controls
+@using Oqtane.Modules.Controls
 @using Oqtane.Shared;
+@namespace Oqtane.Modules.HtmlText
 @inherits ModuleBase
 @inject IUriHelper UriHelper
 @inject HttpClient http
@@ -13,7 +14,10 @@
 
 @((MarkupString)content)
 
-<br /><ActionLink Action="Edit" /><br /><br />
+<br />
+<ActionLink Action="Edit" />
+<br />
+<br />
 
 @code {
     string message = "";
diff --git a/Oqtane.Client/Modules/HtmlText/Module.cs b/Oqtane.Client/Modules/HtmlText/Module.cs
index c21d8023..2928d111 100644
--- a/Oqtane.Client/Modules/HtmlText/Module.cs
+++ b/Oqtane.Client/Modules/HtmlText/Module.cs
@@ -1,7 +1,7 @@
 using Oqtane.Modules;
 using System.Collections.Generic;
 
-namespace Oqtane.Client.Modules.HtmlText
+namespace Oqtane.Modules.HtmlText
 {
     public class Module : IModule
     {
diff --git a/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs b/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs
index e5fb4e85..e2849879 100644
--- a/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs
+++ b/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs
@@ -4,10 +4,10 @@ using System.Threading.Tasks;
 using System.Net.Http;
 using Microsoft.AspNetCore.Components;
 using Oqtane.Services;
-using Oqtane.Shared.Modules.HtmlText.Models;
+using Oqtane.Modules.HtmlText.Models;
 using Oqtane.Shared;
 
-namespace Oqtane.Client.Modules.HtmlText.Services
+namespace Oqtane.Modules.HtmlText.Services
 {
     public class HtmlTextService : ServiceBase, IHtmlTextService
     {
diff --git a/Oqtane.Client/Modules/HtmlText/Services/IHtmlTextService.cs b/Oqtane.Client/Modules/HtmlText/Services/IHtmlTextService.cs
index fe880d87..6ce1d646 100644
--- a/Oqtane.Client/Modules/HtmlText/Services/IHtmlTextService.cs
+++ b/Oqtane.Client/Modules/HtmlText/Services/IHtmlTextService.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Oqtane.Shared.Modules.HtmlText.Models;
+using Oqtane.Modules.HtmlText.Models;
 
-namespace Oqtane.Client.Modules.HtmlText.Services
+namespace Oqtane.Modules.HtmlText.Services
 {
     public interface IHtmlTextService 
     {
diff --git a/Oqtane.Client/Modules/Weather/Index.razor b/Oqtane.Client/Modules/Weather/Index.razor
index 200b279e..55ff47a2 100644
--- a/Oqtane.Client/Modules/Weather/Index.razor
+++ b/Oqtane.Client/Modules/Weather/Index.razor
@@ -1,5 +1,6 @@
 @using Oqtane.Modules
-@using Oqtane.Client.Modules.Weather.Services
+@using Oqtane.Modules.Weather.Services
+@namespace Oqtane.Modules.Weather
 @inherits ModuleBase
 
 @if (forecasts == null)
diff --git a/Oqtane.Client/Modules/Weather/Models/WeatherForecast.cs b/Oqtane.Client/Modules/Weather/Models/WeatherForecast.cs
index 5831c6f4..7e02ea8a 100644
--- a/Oqtane.Client/Modules/Weather/Models/WeatherForecast.cs
+++ b/Oqtane.Client/Modules/Weather/Models/WeatherForecast.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Oqtane.Client.Modules.Weather
+namespace Oqtane.Modules.Weather
 {
     public class WeatherForecast
     {
diff --git a/Oqtane.Client/Modules/Weather/Module.cs b/Oqtane.Client/Modules/Weather/Module.cs
index e4134815..04286cba 100644
--- a/Oqtane.Client/Modules/Weather/Module.cs
+++ b/Oqtane.Client/Modules/Weather/Module.cs
@@ -1,7 +1,7 @@
 using Oqtane.Modules;
 using System.Collections.Generic;
 
-namespace Oqtane.Client.Modules.Weather
+namespace Oqtane.Modules.Weather
 {
     public class Module : IModule
     {
diff --git a/Oqtane.Client/Modules/Weather/Services/IWeatherForecastService.cs b/Oqtane.Client/Modules/Weather/Services/IWeatherForecastService.cs
index 883ce664..743848fb 100644
--- a/Oqtane.Client/Modules/Weather/Services/IWeatherForecastService.cs
+++ b/Oqtane.Client/Modules/Weather/Services/IWeatherForecastService.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace Oqtane.Client.Modules.Weather.Services
+namespace Oqtane.Modules.Weather.Services
 {
     public interface IWeatherForecastService
     {
diff --git a/Oqtane.Client/Modules/Weather/Services/WeatherForecastService.cs b/Oqtane.Client/Modules/Weather/Services/WeatherForecastService.cs
index e2c02b23..e6ad13d9 100644
--- a/Oqtane.Client/Modules/Weather/Services/WeatherForecastService.cs
+++ b/Oqtane.Client/Modules/Weather/Services/WeatherForecastService.cs
@@ -3,7 +3,7 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Oqtane.Client.Modules.Weather.Services
+namespace Oqtane.Modules.Weather.Services
 {
     public class WeatherForecastService : IWeatherForecastService
     {
diff --git a/Oqtane.Client/Services/Interfaces/IPageService.cs b/Oqtane.Client/Services/Interfaces/IPageService.cs
index 846c7b9a..d1ec74f4 100644
--- a/Oqtane.Client/Services/Interfaces/IPageService.cs
+++ b/Oqtane.Client/Services/Interfaces/IPageService.cs
@@ -10,6 +10,7 @@ namespace Oqtane.Services
         Task<Page> GetPageAsync(int PageId);
         Task<Page> AddPageAsync(Page Page);
         Task<Page> UpdatePageAsync(Page Page);
+        Task UpdatePageOrderAsync(int SiteId, int? ParentId);
         Task DeletePageAsync(int PageId);
     }
 }
diff --git a/Oqtane.Client/Services/PageService.cs b/Oqtane.Client/Services/PageService.cs
index 74f75e15..e23ea0f1 100644
--- a/Oqtane.Client/Services/PageService.cs
+++ b/Oqtane.Client/Services/PageService.cs
@@ -5,6 +5,7 @@ using System.Net.Http;
 using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
 using Oqtane.Shared;
+using System;
 
 namespace Oqtane.Services
 {
@@ -29,7 +30,8 @@ namespace Oqtane.Services
         public async Task<List<Page>> GetPagesAsync(int SiteId)
         {
             List<Page> pages = await http.GetJsonAsync<List<Page>>(apiurl + "?siteid=" + SiteId.ToString());
-            return pages.OrderBy(item => item.Order).ToList();
+            pages = GetPagesHierarchy(pages);
+            return pages;
         }
 
         public async Task<Page> GetPageAsync(int PageId)
@@ -46,9 +48,46 @@ namespace Oqtane.Services
         {
             return await http.PutJsonAsync<Page>(apiurl + "/" + Page.PageId.ToString(), Page);
         }
+
+        public async Task UpdatePageOrderAsync(int SiteId, int? ParentId)
+        {
+            await http.PutJsonAsync(apiurl + "/?siteid=" + SiteId.ToString() + "&parentid=" + ((ParentId == null) ? "" : ParentId.ToString()), null);
+        }
+
         public async Task DeletePageAsync(int PageId)
         {
             await http.DeleteAsync(apiurl + "/" + PageId.ToString());
         }
+
+        private static List<Page> GetPagesHierarchy(List<Page> Pages)
+        {
+            List<Page> hierarchy = new List<Page>();
+            Action<List<Page>, Page> GetPath = null;
+            GetPath = (List<Page> pages, Page page) =>
+            {
+                IEnumerable<Page> children;
+                int level;
+                if (page == null)
+                {
+                    level = -1;
+                    children = Pages.Where(item => item.ParentId == null);
+                }
+                else
+                {
+                    level = page.Level;
+                    children = Pages.Where(item => item.ParentId == page.PageId);
+                }
+                foreach (Page child in children)
+                {
+                    child.Level = level + 1;
+                    child.HasChildren = Pages.Where(item => item.ParentId == child.PageId).Any();
+                    hierarchy.Add(child);
+                    GetPath(pages, child);
+                }
+            };
+            Pages = Pages.OrderBy(item => item.Order).ToList();
+            GetPath(Pages, null);
+            return hierarchy;
+        }
     }
 }
diff --git a/Oqtane.Client/Shared/Container.razor b/Oqtane.Client/Shared/ContainerBuilder.razor
similarity index 87%
rename from Oqtane.Client/Shared/Container.razor
rename to Oqtane.Client/Shared/ContainerBuilder.razor
index 3f18b975..10e30bf7 100644
--- a/Oqtane.Client/Shared/Container.razor
+++ b/Oqtane.Client/Shared/ContainerBuilder.razor
@@ -1,6 +1,7 @@
 @using Oqtane.Models
 @using Oqtane.Shared
 @using Oqtane.Modules
+@namespace Oqtane.Shared
 
 <CascadingValue Value="@ModuleState">
     @DynamicComponent
@@ -36,8 +37,8 @@
             }
             else
             {
-                // container does not exist with type specified
-                builder.OpenComponent(0, Type.GetType(Constants.ModuleMessageControl));
+            // container does not exist with type specified
+            builder.OpenComponent(0, Type.GetType(Constants.ModuleMessageControl));
                 builder.AddAttribute(1, "Message", "Error Loading Module Container " + container);
                 builder.CloseComponent();
             }
diff --git a/Oqtane.Client/Shared/Installer.razor b/Oqtane.Client/Shared/Installer.razor
index 7be53818..de2bf1b4 100644
--- a/Oqtane.Client/Shared/Installer.razor
+++ b/Oqtane.Client/Shared/Installer.razor
@@ -1,6 +1,7 @@
 @using Oqtane.Services
 @using Oqtane.Models
 @using Oqtane.Shared
+@namespace Oqtane.Shared
 @inject IUriHelper UriHelper
 @inject IInstallationService InstallationService
 @inject IUserService UserService
diff --git a/Oqtane.Client/Shared/ModuleInstance.razor b/Oqtane.Client/Shared/ModuleInstance.razor
index d1f8ef2e..2b67de38 100644
--- a/Oqtane.Client/Shared/ModuleInstance.razor
+++ b/Oqtane.Client/Shared/ModuleInstance.razor
@@ -1,6 +1,7 @@
 @using Oqtane.Models
 @using Oqtane.Shared
 @using Oqtane.Modules
+@namespace Oqtane.Shared
 
 @DynamicComponent
 
@@ -34,8 +35,8 @@
             }
             else
             {
-                // module does not exist with typename specified
-                builder.OpenComponent(0, Type.GetType(Constants.ModuleMessageControl));
+            // module does not exist with typename specified
+            builder.OpenComponent(0, Type.GetType(Constants.ModuleMessageControl));
                 builder.AddAttribute(1, "Message", "Error Loading Component For Module " + ModuleState.ModuleDefinitionName);
                 builder.CloseComponent();
             }
diff --git a/Oqtane.Client/Shared/Pane.razor b/Oqtane.Client/Shared/Pane.razor
index 7da6fe9a..cb66c01e 100644
--- a/Oqtane.Client/Shared/Pane.razor
+++ b/Oqtane.Client/Shared/Pane.razor
@@ -5,6 +5,7 @@
 @using Oqtane.Shared
 @using Oqtane.Security
 @using System.Linq
+@namespace Oqtane.Shared
 @inject IUserService UserService
 @inject IModuleService ModuleService
 @inject IModuleDefinitionService ModuleDefinitionService
@@ -66,8 +67,8 @@
                             }
                             else
                             {
-                                // verify security access level for this module control
-                                switch (module.SecurityAccessLevel)
+                            // verify security access level for this module control
+                            switch (module.SecurityAccessLevel)
                                 {
                                     case SecurityAccessLevel.Anonymous:
                                         authorized = true;
@@ -99,8 +100,8 @@
                         }
                         else
                         {
-                            // module control does not exist with name specified
-                        }
+                        // module control does not exist with name specified
+                    }
                     }
                 }
             }
@@ -111,8 +112,8 @@
                     Module module = PageState.Modules.Where(item => item.ModuleId == PageState.ModuleId).FirstOrDefault();
                     if (module != null && module.Pane == Name)
                     {
-                        // check if user is authorized to view module
-                        if (UserSecurity.IsAuthorized(PageState.User, "View", module.Permissions))
+                    // check if user is authorized to view module
+                    if (UserSecurity.IsAuthorized(PageState.User, "View", module.Permissions))
                         {
                             builder.OpenComponent(0, Type.GetType(Constants.DefaultContainer));
                             builder.AddAttribute(1, "Module", module);
@@ -124,8 +125,8 @@
                 {
                     foreach (Module module in PageState.Modules.Where(item => item.Pane == Name).OrderBy(x => x.Order).ToArray())
                     {
-                        // check if user is authorized to view module
-                        if (UserSecurity.IsAuthorized(PageState.User, "View", module.Permissions))
+                    // check if user is authorized to view module
+                    if (UserSecurity.IsAuthorized(PageState.User, "View", module.Permissions))
                         {
                             builder.OpenComponent(0, Type.GetType(Constants.DefaultContainer));
                             builder.AddAttribute(1, "Module", module);
diff --git a/Oqtane.Client/Shared/PaneLayout.razor b/Oqtane.Client/Shared/PaneLayout.razor
index 268d9ecc..71366a87 100644
--- a/Oqtane.Client/Shared/PaneLayout.razor
+++ b/Oqtane.Client/Shared/PaneLayout.razor
@@ -1,5 +1,6 @@
 @using System
 @using Oqtane.Shared
+@namespace Oqtane.Shared
 
 @DynamicComponent
 
@@ -21,8 +22,8 @@
             }
             else
             {
-                // layout does not exist with type specified
-            }
+            // layout does not exist with type specified
+        }
         };
     }
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Shared/SiteRouter.razor b/Oqtane.Client/Shared/SiteRouter.razor
index 74e23b2b..779de435 100644
--- a/Oqtane.Client/Shared/SiteRouter.razor
+++ b/Oqtane.Client/Shared/SiteRouter.razor
@@ -7,6 +7,7 @@
 @using Oqtane.Shared
 @using Oqtane.Security
 @using Microsoft.AspNetCore.Components.Routing
+@namespace Oqtane.Shared
 @inject AuthenticationStateProvider AuthenticationStateProvider
 @inject SiteState SiteState
 @inject IUriHelper UriHelper
diff --git a/Oqtane.Client/Shared/Theme.razor b/Oqtane.Client/Shared/ThemeBuilder.razor
similarity index 81%
rename from Oqtane.Client/Shared/Theme.razor
rename to Oqtane.Client/Shared/ThemeBuilder.razor
index fd29a0df..63cdc8da 100644
--- a/Oqtane.Client/Shared/Theme.razor
+++ b/Oqtane.Client/Shared/ThemeBuilder.razor
@@ -1,5 +1,6 @@
 @using Oqtane.Shared
 @using Oqtane.Modules
+@namespace Oqtane.Shared
 
 @DynamicComponent
 
@@ -20,8 +21,8 @@
             }
             else
             {
-                // theme does not exist with type specified
-                builder.OpenComponent(0, Type.GetType(Constants.ModuleMessageControl));
+            // theme does not exist with type specified
+            builder.OpenComponent(0, Type.GetType(Constants.ModuleMessageControl));
                 builder.AddAttribute(1, "Message", "Error Loading Page Theme " + PageState.Page.ThemeType);
                 builder.CloseComponent();
             }
diff --git a/Oqtane.Client/Shared/Utilities.cs b/Oqtane.Client/Shared/Utilities.cs
index f4a60e71..f25ead1c 100644
--- a/Oqtane.Client/Shared/Utilities.cs
+++ b/Oqtane.Client/Shared/Utilities.cs
@@ -1,5 +1,7 @@
-using System;
-using Oqtane.Models;
+using Oqtane.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Oqtane.Shared
 {
diff --git a/Oqtane.Client/Themes/AdminContainer.razor b/Oqtane.Client/Themes/AdminContainer.razor
index ff2f67f1..c7380739 100644
--- a/Oqtane.Client/Themes/AdminContainer.razor
+++ b/Oqtane.Client/Themes/AdminContainer.razor
@@ -1,7 +1,6 @@
 @using Oqtane.Shared
-@using Oqtane.Themes
-@using Oqtane.Client.Themes.Controls
-@using Oqtane.Client.Shared
+@using Oqtane.Themes.Controls
+@namespace Oqtane.Themes
 @inherits ContainerBase
 <div id="modal" class="modal" style="display: block">
     <div class="modal-content">
diff --git a/Oqtane.Client/Themes/Controls/ControlPanel.razor b/Oqtane.Client/Themes/Controls/ControlPanel.razor
index 4b6947cf..59541741 100644
--- a/Oqtane.Client/Themes/Controls/ControlPanel.razor
+++ b/Oqtane.Client/Themes/Controls/ControlPanel.razor
@@ -4,6 +4,7 @@
 @using Oqtane.Themes
 @using Oqtane.Shared
 @using Oqtane.Security
+@namespace Oqtane.Themes.Controls
 @inherits ThemeObjectBase
 @inject IUriHelper UriHelper
 @inject IUserService UserService
@@ -133,9 +134,10 @@
             }
             pagemodule.Title = title;
             pagemodule.Pane = pane;
-            pagemodule.Order = 0;
+            pagemodule.Order = int.MaxValue;
             pagemodule.ContainerType = containertype;
             await PageModuleService.AddPageModuleAsync(pagemodule);
+            await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
 
             PageState.Reload = Constants.ReloadPage;
             UriHelper.NavigateTo(NavigateUrl());
diff --git a/Oqtane.Client/Themes/Controls/Login.razor b/Oqtane.Client/Themes/Controls/Login.razor
index faba904d..93c59bb1 100644
--- a/Oqtane.Client/Themes/Controls/Login.razor
+++ b/Oqtane.Client/Themes/Controls/Login.razor
@@ -3,6 +3,7 @@
 @using Oqtane.Providers
 @using Oqtane.Shared
 @using Microsoft.JSInterop
+@namespace Oqtane.Themes.Controls
 @inherits ThemeObjectBase
 @inject IUriHelper UriHelper
 @inject IUserService UserService
diff --git a/Oqtane.Client/Themes/Controls/Logo.razor b/Oqtane.Client/Themes/Controls/Logo.razor
index 83459a32..ef4bee38 100644
--- a/Oqtane.Client/Themes/Controls/Logo.razor
+++ b/Oqtane.Client/Themes/Controls/Logo.razor
@@ -1,4 +1,5 @@
 @using Oqtane.Themes
+@namespace Oqtane.Themes.Controls
 @inherits ThemeObjectBase
 
 @((MarkupString)logo)
diff --git a/Oqtane.Client/Themes/Controls/Menu.razor b/Oqtane.Client/Themes/Controls/Menu.razor
index 21bdc6b6..d9528094 100644
--- a/Oqtane.Client/Themes/Controls/Menu.razor
+++ b/Oqtane.Client/Themes/Controls/Menu.razor
@@ -3,6 +3,7 @@
 @using Oqtane.Services
 @using Oqtane.Models;
 @using Oqtane.Security
+@namespace Oqtane.Themes.Controls
 @inherits ThemeObjectBase
 @inject IPageService PageService
 @inject IUserService UserService
@@ -23,7 +24,7 @@
         {
             string url = NavigateUrl(p.Path);
             <li class="nav-item px-3">
-                <NavLink class="nav-link" href="@url" Match="NavLinkMatch.All">
+                <NavLink @key="@p.PageId" class="nav-link" href="@url" Match="NavLinkMatch.All">
                     <span class="oi @p.Icon" aria-hidden="true"></span> @p.Name
                 </NavLink>
             </li>
@@ -41,7 +42,7 @@
         if (PageState.Pages.Where(item => item.ParentId == PageState.Page.PageId).FirstOrDefault() == null)
         {
             // display list of pages which have same parent as current page
-            pages = PageState.Pages.Where(item => item.ParentId == PageState.Page.ParentId).ToList();
+            pages = PageState.Pages.Where(item => item.ParentId == PageState.Page.ParentId).OrderBy(item => item.Order).ToList();
             // if current page has parent
             if (PageState.Page.ParentId != null)
             {
@@ -51,7 +52,7 @@
         else
         {
             // display list of pages which are children of current page
-            pages = PageState.Pages.Where(item => item.ParentId == PageState.Page.PageId).ToList();
+            pages = PageState.Pages.Where(item => item.ParentId == PageState.Page.PageId).OrderBy(item => item.Order).ToList();
             // current page is parent
             parent = PageState.Pages.Where(item => item.ParentId == PageState.Page.ParentId).FirstOrDefault();
         }
diff --git a/Oqtane.Client/Themes/Controls/Menu2.razor b/Oqtane.Client/Themes/Controls/Menu2.razor
new file mode 100644
index 00000000..111bdd22
--- /dev/null
+++ b/Oqtane.Client/Themes/Controls/Menu2.razor
@@ -0,0 +1,68 @@
+@using Microsoft.AspNetCore.Components.Routing
+@using Oqtane.Themes
+@using Oqtane.Services
+@using Oqtane.Models;
+@using Oqtane.Security
+@namespace Oqtane.Themes.Controls
+@inherits ThemeObjectBase
+@inject IUserService UserService
+
+@if (menu != "")
+{
+    @((MarkupString)menu)
+}
+
+@code {
+    string menu = "";
+
+    protected override void OnInitialized()
+    {
+        int level = -1;
+        int securitylevel = int.MaxValue;
+
+        menu = "<ul class=\"nav flex-column\">\n";
+        foreach (Page p in PageState.Pages.Where(item => item.IsNavigation))
+        {
+            for (int l = p.Level; l < level; l++)
+            {
+                menu += "</ul>\n";
+                menu += "</div>\n";
+            }
+            if (UserSecurity.IsAuthorized(PageState.User, "View", p.Permissions) && p.Level <= securitylevel)
+            {
+                securitylevel = int.MaxValue;
+                if (p.HasChildren)
+                {
+                    menu += "<li class=\"nav-item px-3\">\n";
+                    menu += "<a class=\"nav-link collapsed\" href=\"#submenu" + p.PageId.ToString() + "\" data-toggle=\"collapse\" data-target=\"#submenu" + p.PageId.ToString() + "\">";
+                    menu += "<span class=\"oi " + p.Icon + "\" aria-hidden=\"true\"></span>" + p.Name;
+                    menu += "</a>\n";
+                    menu += "<div class=\"collapse\" id=\"submenu" + p.PageId.ToString() + "\" aria-expanded=\"false\">\n";
+                    menu += "<ul class=\"nav flex-column\">\n";
+                }
+                else
+                {
+                    menu += "<li class=\"nav-item px-3\">\n";
+                    menu += "<a class=\"nav-link\" href=\"" + NavigateUrl(p.Path) + "\">";
+                    menu += "<span class=\"oi " + p.Icon + "\" aria-hidden=\"true\"></span>" + p.Name;
+                    menu += "</a>\n";
+                    menu += "</li>\n";
+                }
+                level = p.Level;
+            }
+            else
+            {
+                if (securitylevel == int.MaxValue)
+                {
+                    securitylevel = p.Level;
+                }
+            }
+        }
+        for (int l = 0; l < level; l++)
+        {
+            menu += "</ul>\n";
+            menu += "</div>\n";
+        }
+        menu += "</ul>";
+    }
+}
diff --git a/Oqtane.Client/Themes/Controls/ModuleActions.razor b/Oqtane.Client/Themes/Controls/ModuleActions.razor
index d82a7d6f..a83f6ddd 100644
--- a/Oqtane.Client/Themes/Controls/ModuleActions.razor
+++ b/Oqtane.Client/Themes/Controls/ModuleActions.razor
@@ -3,6 +3,7 @@
 @using Oqtane.Models
 @using Oqtane.Shared
 @using Oqtane.Security
+@namespace Oqtane.Themes.Controls
 @inherits ContainerBase
 @inject IUriHelper UriHelper
 @inject IUserService UserService
@@ -82,7 +83,7 @@
                     await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
                     break;
                 case ">>":
-                    pagemodule.Order = ModuleState.PaneModuleCount * 2;
+                    pagemodule.Order = int.MaxValue;
                     await PageModuleService.UpdatePageModuleAsync(pagemodule);
                     await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
                     break;
diff --git a/Oqtane.Client/Themes/Controls/ModuleTitle.razor b/Oqtane.Client/Themes/Controls/ModuleTitle.razor
index fa7e92a9..fc26b33f 100644
--- a/Oqtane.Client/Themes/Controls/ModuleTitle.razor
+++ b/Oqtane.Client/Themes/Controls/ModuleTitle.razor
@@ -1,4 +1,5 @@
 @using Oqtane.Themes
+@namespace Oqtane.Themes.Controls
 @inherits ContainerBase
 
 @title
diff --git a/Oqtane.Client/Themes/Controls/Profile.razor b/Oqtane.Client/Themes/Controls/Profile.razor
index 90808163..c9667a01 100644
--- a/Oqtane.Client/Themes/Controls/Profile.razor
+++ b/Oqtane.Client/Themes/Controls/Profile.razor
@@ -1,4 +1,5 @@
 @using Oqtane.Themes
+@namespace Oqtane.Themes.Controls
 @inherits ThemeObjectBase
 @inject IUriHelper UriHelper
 
diff --git a/Oqtane.Client/Themes/DefaultContainer.razor b/Oqtane.Client/Themes/DefaultContainer.razor
index b407e2d5..29b2e8c3 100644
--- a/Oqtane.Client/Themes/DefaultContainer.razor
+++ b/Oqtane.Client/Themes/DefaultContainer.razor
@@ -1,6 +1,6 @@
-@using Oqtane.Themes
-@using Oqtane.Client.Themes.Controls
-@using Oqtane.Client.Shared
+@using Oqtane.Themes.Controls
+@using Oqtane.Shared
+@namespace Oqtane.Themes
 @inherits ContainerBase
 <div class="container">
     <div class="row px-4">
diff --git a/Oqtane.Client/Themes/Theme1/Container1.razor b/Oqtane.Client/Themes/Theme1/Container1.razor
index c8cbfa1d..cfd1b006 100644
--- a/Oqtane.Client/Themes/Theme1/Container1.razor
+++ b/Oqtane.Client/Themes/Theme1/Container1.razor
@@ -1,6 +1,7 @@
 @using Oqtane.Themes
-@using Oqtane.Client.Themes.Controls
-@using Oqtane.Client.Shared
+@using Oqtane.Themes.Controls
+@using Oqtane.Shared
+@namespace Oqtane.Themes.Theme1
 @inherits ContainerBase
 <div class="container">
     <div class="row px-4">
diff --git a/Oqtane.Client/Themes/Theme1/Theme1.razor b/Oqtane.Client/Themes/Theme1/Theme1.razor
index 8de6feaf..7b27e713 100644
--- a/Oqtane.Client/Themes/Theme1/Theme1.razor
+++ b/Oqtane.Client/Themes/Theme1/Theme1.razor
@@ -1,6 +1,7 @@
 @using Oqtane.Themes
-@using Oqtane.Client.Themes.Controls
-@using Oqtane.Client.Shared
+@using Oqtane.Themes.Controls
+@using Oqtane.Shared
+@namespace Oqtane.Themes.Theme1
 @inherits ThemeBase
 
 <div class="sidebar">
diff --git a/Oqtane.Client/Themes/Theme2/Container2.razor b/Oqtane.Client/Themes/Theme2/Container2.razor
index 55d18353..da1280f8 100644
--- a/Oqtane.Client/Themes/Theme2/Container2.razor
+++ b/Oqtane.Client/Themes/Theme2/Container2.razor
@@ -1,6 +1,7 @@
 @using Oqtane.Themes
-@using Oqtane.Client.Themes.Controls
-@using Oqtane.Client.Shared
+@using Oqtane.Themes.Controls
+@using Oqtane.Shared
+@namespace Oqtane.Themes.Theme2
 @inherits ContainerBase
 <div class="container">
     <div class="row px-4">
diff --git a/Oqtane.Client/Themes/Theme2/Theme2.razor b/Oqtane.Client/Themes/Theme2/Theme2.razor
index 7415e777..b450b927 100644
--- a/Oqtane.Client/Themes/Theme2/Theme2.razor
+++ b/Oqtane.Client/Themes/Theme2/Theme2.razor
@@ -1,6 +1,7 @@
 @using Oqtane.Themes
-@using Oqtane.Client.Themes.Controls
-@using Oqtane.Client.Shared
+@using Oqtane.Themes.Controls
+@using Oqtane.Shared
+@namespace Oqtane.Themes.Theme2
 @inherits ThemeBase
 
 <div class="sidebar">
diff --git a/Oqtane.Client/Themes/Theme3/HorizontalLayout.razor b/Oqtane.Client/Themes/Theme3/HorizontalLayout.razor
index bf6b4eda..bf00b8c2 100644
--- a/Oqtane.Client/Themes/Theme3/HorizontalLayout.razor
+++ b/Oqtane.Client/Themes/Theme3/HorizontalLayout.razor
@@ -1,5 +1,6 @@
 @using Oqtane.Themes
-@using Oqtane.Client.Shared
+@using Oqtane.Shared
+@namespace Oqtane.Themes.Theme3
 @inherits ThemeBase
 
 <div class="row px-4">
diff --git a/Oqtane.Client/Themes/Theme3/Theme3.razor b/Oqtane.Client/Themes/Theme3/Theme3.razor
index a8f5c934..f10abf4e 100644
--- a/Oqtane.Client/Themes/Theme3/Theme3.razor
+++ b/Oqtane.Client/Themes/Theme3/Theme3.razor
@@ -1,6 +1,7 @@
 @using Oqtane.Themes
-@using Oqtane.Client.Themes.Controls
-@using Oqtane.Client.Shared
+@using Oqtane.Themes.Controls
+@using Oqtane.Shared
+@namespace Oqtane.Themes.Theme3
 @inherits ThemeBase
 
 <div class="sidebar">
diff --git a/Oqtane.Client/Themes/Theme3/VerticalLayout.razor b/Oqtane.Client/Themes/Theme3/VerticalLayout.razor
index c09852c8..a17afc3f 100644
--- a/Oqtane.Client/Themes/Theme3/VerticalLayout.razor
+++ b/Oqtane.Client/Themes/Theme3/VerticalLayout.razor
@@ -1,5 +1,6 @@
 @using Oqtane.Themes
-@using Oqtane.Client.Shared
+@using Oqtane.Shared
+@namespace Oqtane.Themes.Theme3
 @inherits ThemeBase
 
 <div class="row px-4">
diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs
index 8f75bcf0..3a08e680 100644
--- a/Oqtane.Server/Controllers/PageController.cs
+++ b/Oqtane.Server/Controllers/PageController.cs
@@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Authorization;
 using Oqtane.Repository;
 using Oqtane.Models;
 using Oqtane.Shared;
+using System.Linq;
 
 namespace Oqtane.Controllers
 {
@@ -62,6 +63,24 @@ namespace Oqtane.Controllers
             return Page;
         }
 
+        // PUT api/<controller>/?siteid=x&parentid=y
+        [HttpPut]
+        [Authorize(Roles = Constants.AdminRole)]
+        public void Put(int siteid, int? parentid)
+        {
+            int order = 1;
+            List<Page> pages = Pages.GetPages(siteid).ToList();
+            foreach (Page page in pages.Where(item => item.ParentId == parentid).OrderBy(item => item.Order))
+            {
+                if (page.Order != order)
+                {
+                    page.Order = order;
+                    Pages.UpdatePage(page);
+                }
+                order += 2;
+            }
+        }
+
         // DELETE api/<controller>/5
         [HttpDelete("{id}")]
         [Authorize(Roles = Constants.AdminRole)]
diff --git a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs
index 5fd53c83..761b4f37 100644
--- a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs
+++ b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs
@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
-using Oqtane.Shared.Modules.HtmlText.Models;
-using Oqtane.Server.Modules.HtmlText.Repository;
+using Oqtane.Modules.HtmlText.Models;
+using Oqtane.Modules.HtmlText.Repository;
 using Microsoft.AspNetCore.Http;
 
-namespace Oqtane.Server.Modules.HtmlText.Controllers
+namespace Oqtane.Modules.HtmlText.Controllers
 {
     [Route("{site}/api/[controller]")]
     public class HtmlTextController : Controller
diff --git a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs
index 6c32a49f..2aa3b5b4 100644
--- a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs
+++ b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs
@@ -1,10 +1,10 @@
 using Microsoft.EntityFrameworkCore;
-using Oqtane.Shared.Modules.HtmlText.Models;
+using Oqtane.Modules.HtmlText.Models;
 using Oqtane.Repository;
 using Oqtane.Modules;
 using Microsoft.AspNetCore.Http;
 
-namespace Oqtane.Server.Modules.HtmlText.Repository
+namespace Oqtane.Modules.HtmlText.Repository
 {
     public class HtmlTextContext : DBContextBase, IService
     {
diff --git a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs
index 23e6a824..9cda535b 100644
--- a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs
+++ b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs
@@ -1,10 +1,10 @@
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
-using Oqtane.Shared.Modules.HtmlText.Models;
+using Oqtane.Modules.HtmlText.Models;
 using Oqtane.Modules;
 
-namespace Oqtane.Server.Modules.HtmlText.Repository
+namespace Oqtane.Modules.HtmlText.Repository
 {
     public class HtmlTextRepository : IHtmlTextRepository, IService
     {
diff --git a/Oqtane.Server/Modules/HtmlText/Repository/IHtmlTextRepository.cs b/Oqtane.Server/Modules/HtmlText/Repository/IHtmlTextRepository.cs
index 95bf5f19..33e368c4 100644
--- a/Oqtane.Server/Modules/HtmlText/Repository/IHtmlTextRepository.cs
+++ b/Oqtane.Server/Modules/HtmlText/Repository/IHtmlTextRepository.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using Oqtane.Shared.Modules.HtmlText.Models;
+using Oqtane.Modules.HtmlText.Models;
 
-namespace Oqtane.Server.Modules.HtmlText.Repository
+namespace Oqtane.Modules.HtmlText.Repository
 {
     public interface IHtmlTextRepository
     {
diff --git a/Oqtane.Server/Scripts/00.00.00.sql b/Oqtane.Server/Scripts/00.00.00.sql
index 01b028f7..c71ec72f 100644
--- a/Oqtane.Server/Scripts/00.00.00.sql
+++ b/Oqtane.Server/Scripts/00.00.00.sql
@@ -8,6 +8,7 @@ CREATE TABLE [dbo].[Site](
 	[SiteId] [int] IDENTITY(1,1) NOT NULL,
 	[Name] [nvarchar](200) NOT NULL,
 	[Logo] [nvarchar](50) NOT NULL,
+	[DefaultThemeType] [nvarchar](200) NULL,
 	[CreatedBy] [nvarchar](256) NOT NULL,
 	[CreatedOn] [datetime] NOT NULL,
 	[ModifiedBy] [nvarchar](256) NOT NULL,
@@ -349,11 +350,11 @@ Create seed data
 
 SET IDENTITY_INSERT [dbo].[Site] ON 
 GO
-INSERT [dbo].[Site] ([SiteId], [Name], [Logo], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (1, N'Site1', N'oqtane.png', '', getdate(), '', getdate())
+INSERT [dbo].[Site] ([SiteId], [Name], [Logo], [DefaultThemeType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
+VALUES (1, N'Site1', N'oqtane.png', N'Oqtane.Themes.Theme1.Theme1, Oqtane.Client', '', getdate(), '', getdate())
 GO
-INSERT [dbo].[Site] ([SiteId], [Name], [Logo], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (2, N'Site2', N'oqtane.png', '', getdate(), '', getdate())
+INSERT [dbo].[Site] ([SiteId], [Name], [Logo], [DefaultThemeType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
+VALUES (2, N'Site2', N'oqtane.png', N'Oqtane.Themes.Theme1.Theme1, Oqtane.Client', '', getdate(), '', getdate())
 GO
 SET IDENTITY_INSERT [dbo].[Site] OFF
 GO
@@ -413,7 +414,7 @@ GO
 SET IDENTITY_INSERT [dbo].[Page] ON 
 GO
 INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (1, 1, N'Page1', N'', N'Oqtane.Client.Themes.Theme1.Theme1, Oqtane.Client', N'oi-home', N'Left;Right', NULL, 1, 1, N'', 0, '', getdate(), '', getdate())
+VALUES (1, 1, N'Page1', N'', N'Oqtane.Themes.Theme1.Theme1, Oqtane.Client', N'oi-home', N'Left;Right', NULL, 1, 1, N'', 0, '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 1, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -422,14 +423,14 @@ GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 1, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (2, 1, N'Page2', N'page2', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane.Client', N'oi-plus', N'Top;Bottom', NULL, 3, 1, N'', 0, '', getdate(), '', getdate())
+VALUES (2, 1, N'Page2', N'page2', N'Oqtane.Themes.Theme2.Theme2, Oqtane.Client', N'oi-plus', N'Top;Bottom', NULL, 3, 1, N'', 0, '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 2, 'View', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 2, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (3, 1, N'Page3', N'page3', N'Oqtane.Client.Themes.Theme3.Theme3, Oqtane.Client', N'oi-list-rich', N'Left;Right', NULL, 3, 1, N'Oqtane.Client.Themes.Theme3.HorizontalLayout, Oqtane.Client', 0, '', getdate(), '', getdate())
+VALUES (3, 1, N'Page3', N'page3', N'Oqtane.Themes.Theme3.Theme3, Oqtane.Client', N'oi-list-rich', N'Left;Right', NULL, 5, 1, N'Oqtane.Themes.Theme3.HorizontalLayout, Oqtane.Client', 0, '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 3, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -438,21 +439,56 @@ GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 3, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (4, 1, N'Admin', N'admin', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane.Client', N'oi-home', N'Top;Bottom', NULL, 7, 1, N'', '', 1, getdate(), '', getdate())
+VALUES (4, 1, N'Admin', N'admin', N'Oqtane.Themes.Theme2.Theme2, Oqtane.Client', N'oi-home', N'Top;Bottom', NULL, 7, 1, N'', '', 1, getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 4, 'View', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 4, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (5, 1, N'Page Management', N'admin/pages', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', 4, 1, 1, N'', 1, '', getdate(), '', getdate())
+VALUES (8, 1, N'Site Management', N'admin/sites', N'Oqtane.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', 4, 1, 1, N'', 1, '', getdate(), '', getdate())
+GO
+INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 8, 'View', 1, null, 1, '', getdate(), '', getdate()) 
+GO
+INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 8, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
+GO
+INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
+VALUES (5, 1, N'Page Management', N'admin/pages', N'Oqtane.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', 4, 3, 1, N'', 1, '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 5, 'View', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 5, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (6, 1, N'Login', N'login', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', NULL, 1, 0, N'', 0, '', getdate(), '', getdate())
+VALUES (10, 1, N'Module Management', N'admin/modules', N'Oqtane.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', 4, 5, 1, N'', 1, '', getdate(), '', getdate())
+GO
+INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 10, 'View', 1, null, 1, '', getdate(), '', getdate()) 
+GO
+INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 10, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
+GO
+INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
+VALUES (11, 1, N'Theme Management', N'admin/themes', N'Oqtane.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', 4, 7, 1, N'', 1, '', getdate(), '', getdate())
+GO
+INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 11, 'View', 1, null, 1, '', getdate(), '', getdate()) 
+GO
+INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 11, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
+GO
+INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
+VALUES (9, 1, N'User Management', N'admin/users', N'Oqtane.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', 4, 9, 1, N'', 1, '', getdate(), '', getdate())
+GO
+INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 9, 'View', 1, null, 1, '', getdate(), '', getdate()) 
+GO
+INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 9, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
+GO
+INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
+VALUES (16, 1, N'Role Management', N'admin/roles', N'Oqtane.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', 4, 11, 1, N'', 1, '', getdate(), '', getdate())
+GO
+INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 16, 'View', 1, null, 1, '', getdate(), '', getdate()) 
+GO
+INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 16, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
+GO
+INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
+VALUES (6, 1, N'Login', N'login', N'Oqtane.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', NULL, 7, 0, N'', 0, '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 6, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -461,7 +497,7 @@ GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 6, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (7, 1, N'Register', N'register', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', NULL, 1, 0, N'', 0, '', getdate(), '', getdate())
+VALUES (7, 1, N'Register', N'register', N'Oqtane.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', NULL, 9, 0, N'', 0, '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 7, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -470,35 +506,16 @@ GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 7, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (8, 1, N'Site Management', N'admin/sites', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', 4, 0, 1, N'', 1, '', getdate(), '', getdate())
+VALUES (17, 1, N'Profile', N'profile', N'Oqtane.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', NULL, 11, 0, N'', 0, '', getdate(), '', getdate())
 GO
-INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 8, 'View', 1, null, 1, '', getdate(), '', getdate()) 
+INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 17, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
-INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 8, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
+INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 17, 'View', 1, null, 1, '', getdate(), '', getdate()) 
+GO
+INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 17, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (9, 1, N'User Management', N'admin/users', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', 4, 2, 1, N'', 1, '', getdate(), '', getdate())
-GO
-INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 9, 'View', 1, null, 1, '', getdate(), '', getdate()) 
-GO
-INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 9, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
-GO
-INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (10, 1, N'Module Management', N'admin/modules', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', 4, 3, 1, N'', 1, '', getdate(), '', getdate())
-GO
-INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 10, 'View', 1, null, 1, '', getdate(), '', getdate()) 
-GO
-INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 10, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
-GO
-INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (11, 1, N'Theme Management', N'admin/themes', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', 4, 4, 1, N'', 1, '', getdate(), '', getdate())
-GO
-INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 11, 'View', 1, null, 1, '', getdate(), '', getdate()) 
-GO
-INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 11, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
-GO
-INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (12, 2, N'Page1', N'', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane.Client', N'oi-home', N'Top;Bottom', NULL, 1, 1, N'', 0, '', getdate(), '', getdate())
+VALUES (12, 2, N'Page1', N'', N'Oqtane.Themes.Theme2.Theme2, Oqtane.Client', N'oi-home', N'Top;Bottom', NULL, 1, 1, N'', 0, '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Page', 12, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -507,7 +524,7 @@ GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Page', 12, 'Edit', 3, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (13, 2, N'Page2', N'page2', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane.Client', N'oi-home', N'Top;Bottom', NULL, 1, 1, N'', 0, '', getdate(), '', getdate())
+VALUES (13, 2, N'Page2', N'page2', N'Oqtane.Themes.Theme2.Theme2, Oqtane.Client', N'oi-home', N'Top;Bottom', NULL, 3, 1, N'', 0, '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Page', 13, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -516,7 +533,7 @@ GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Page', 13, 'Edit', 3, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (14, 2, N'Login', N'login', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', NULL, 1, 0, N'', 0, '', getdate(), '', getdate())
+VALUES (14, 2, N'Login', N'login', N'Oqtane.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', NULL, 5, 0, N'', 0, '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Page', 14, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -525,7 +542,7 @@ GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Page', 14, 'Edit', 3, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (15, 2, N'Register', N'register', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', NULL, 1, 0, N'', 0, '', getdate(), '', getdate())
+VALUES (15, 2, N'Register', N'register', N'Oqtane.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', NULL, 7, 0, N'', 0, '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Page', 15, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -533,29 +550,13 @@ INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName],
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Page', 15, 'Edit', 3, null, 1, '', getdate(), '', getdate()) 
 GO
-INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (16, 1, N'Role Management', N'admin/roles', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', 4, 5, 1, N'', 1, '', getdate(), '', getdate())
-GO
-INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 16, 'View', 1, null, 1, '', getdate(), '', getdate()) 
-GO
-INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 16, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
-GO
-INSERT [dbo].[Page] ([PageId], [SiteId], [Name], [Path], [ThemeType], [Icon], [Panes], [ParentId], [Order], [IsNavigation], [LayoutType], [EditMode], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (17, 1, N'Profile', N'profile', N'Oqtane.Client.Themes.Theme2.Theme2, Oqtane.Client', N'', N'Top;Bottom', NULL, 1, 0, N'', 0, '', getdate(), '', getdate())
-GO
-INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 17, 'View', -1, null, 1, '', getdate(), '', getdate()) 
-GO
-INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 17, 'View', 1, null, 1, '', getdate(), '', getdate()) 
-GO
-INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Page', 17, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
-GO
 SET IDENTITY_INSERT [dbo].[Page] OFF 
 GO
 
 SET IDENTITY_INSERT [dbo].[Module] ON 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (1, 1, N'Oqtane.Client.Modules.Weather, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (1, 1, N'Oqtane.Modules.Weather, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 1, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -564,7 +565,7 @@ GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 1, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (2, 1, N'Oqtane.Client.Modules.Counter, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (2, 1, N'Oqtane.Modules.Counter, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 2, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -573,7 +574,7 @@ GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 2, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (3, 1, N'Oqtane.Client.Modules.HtmlText, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (3, 1, N'Oqtane.Modules.HtmlText, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 3, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -582,7 +583,7 @@ GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 3, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (4, 1, N'Oqtane.Client.Modules.Weather, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (4, 1, N'Oqtane.Modules.Weather, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 4, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -591,7 +592,7 @@ GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 4, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (5, 1, N'Oqtane.Client.Modules.HtmlText, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (5, 1, N'Oqtane.Modules.HtmlText, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 5, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -600,7 +601,7 @@ GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 5, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (6, 1, N'Oqtane.Client.Modules.HtmlText, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (6, 1, N'Oqtane.Modules.HtmlText, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 6, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -609,21 +610,21 @@ GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 6, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (7, 1, N'Oqtane.Client.Modules.HtmlText, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (7, 1, N'Oqtane.Modules.HtmlText, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 7, 'View', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 7, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (8, 1, N'Oqtane.Client.Modules.Admin.Pages, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (8, 1, N'Oqtane.Modules.Admin.Pages, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 8, 'View', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 8, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (9, 1, N'Oqtane.Client.Modules.Admin.Login, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (9, 1, N'Oqtane.Modules.Admin.Login, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 9, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -632,7 +633,7 @@ GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 9, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (10, 1, N'Oqtane.Client.Modules.Admin.Register, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (10, 1, N'Oqtane.Modules.Admin.Register, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 10, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -641,42 +642,42 @@ GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 10, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (11, 1, N'Oqtane.Client.Modules.Admin.Admin, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (11, 1, N'Oqtane.Modules.Admin.Dashboard, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 11, 'View', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 11, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (12, 1, N'Oqtane.Client.Modules.Admin.Sites, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (12, 1, N'Oqtane.Modules.Admin.Sites, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 12, 'View', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 12, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (13, 1, N'Oqtane.Client.Modules.Admin.Users, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (13, 1, N'Oqtane.Modules.Admin.Users, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 13, 'View', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 13, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (14, 1, N'Oqtane.Client.Modules.Admin.ModuleDefinitions, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (14, 1, N'Oqtane.Modules.Admin.ModuleDefinitions, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 14, 'View', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 14, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (15, 1, N'Oqtane.Client.Modules.Admin.Themes, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (15, 1, N'Oqtane.Modules.Admin.Themes, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 15, 'View', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 15, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (16, 2, N'Oqtane.Client.Modules.HtmlText, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (16, 2, N'Oqtane.Modules.HtmlText, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Module', 16, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -685,7 +686,7 @@ GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Module', 16, 'Edit', 3, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (17, 2, N'Oqtane.Client.Modules.HtmlText, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (17, 2, N'Oqtane.Modules.HtmlText, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Module', 17, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -694,7 +695,7 @@ GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Module', 17, 'Edit', 3, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (18, 2, N'Oqtane.Client.Modules.Admin.Login, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (18, 2, N'Oqtane.Modules.Admin.Login, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Module', 18, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -703,7 +704,7 @@ GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Module', 18, 'Edit', 3, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (19, 2, N'Oqtane.Client.Modules.Admin.Register, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (19, 2, N'Oqtane.Modules.Admin.Register, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Module', 19, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -712,14 +713,14 @@ GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (2, 'Module', 19, 'Edit', 3, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (20, 1, N'Oqtane.Client.Modules.Admin.Roles, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (20, 1, N'Oqtane.Modules.Admin.Roles, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 20, 'View', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 20, 'Edit', 1, null, 1, '', getdate(), '', getdate()) 
 GO
 INSERT [dbo].[Module] ([ModuleId], [SiteId], [ModuleDefinitionName], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (21, 1, N'Oqtane.Client.Modules.Admin.Profile, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (21, 1, N'Oqtane.Modules.Admin.Profile, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[Permission] ([SiteId], [EntityName], [EntityId], [PermissionName], [RoleId], [UserId], [IsAuthorized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) VALUES (1, 'Module', 21, 'View', -1, null, 1, '', getdate(), '', getdate()) 
 GO
@@ -733,67 +734,67 @@ GO
 SET IDENTITY_INSERT [dbo].[PageModule] ON 
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (1, 1, 1, N'Weather', N'Right', 1, N'Oqtane.Client.Themes.Theme1.Container1, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (1, 1, 1, N'Weather', N'Right', 1, N'Oqtane.Themes.Theme1.Container1, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (2, 1, 2, N'Counter', N'Left', 1, N'Oqtane.Client.Themes.Theme1.Container1, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (2, 1, 2, N'Counter', N'Left', 1, N'Oqtane.Themes.Theme1.Container1, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (3, 1, 3, N'Lorem ipsum', N'Left', 3, N'Oqtane.Client.Themes.Theme1.Container1, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (3, 1, 3, N'Lorem ipsum', N'Left', 3, N'Oqtane.Themes.Theme1.Container1, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (4, 2, 4, N'Weather', N'Top', 1, N'Oqtane.Client.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (4, 2, 4, N'Weather', N'Top', 1, N'Oqtane.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (5, 2, 5, N'Enim sed', N'Top', 3, N'Oqtane.Client.Themes.Theme1.Container1, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (5, 2, 5, N'Enim sed', N'Top', 3, N'Oqtane.Themes.Theme1.Container1, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (6, 3, 6, N'Id consectetur', N'Left', 1, N'Oqtane.Client.Themes.Theme1.Container1, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (6, 3, 6, N'Id consectetur', N'Left', 1, N'Oqtane.Themes.Theme1.Container1, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (7, 3, 7, N'Ornare arcu', N'Right', 1, N'Oqtane.Client.Themes.Theme1.Container1, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (7, 3, 7, N'Ornare arcu', N'Right', 1, N'Oqtane.Themes.Theme1.Container1, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (8, 5, 8, N'Page Management', N'Top', 1, N'Oqtane.Client.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (8, 5, 8, N'Page Management', N'Top', 1, N'Oqtane.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (9, 6, 9, N'Login', N'Top', 1, N'Oqtane.Client.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (9, 6, 9, N'Login', N'Top', 1, N'Oqtane.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (10, 7, 10, N'Register', N'Top', 1, N'Oqtane.Client.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (10, 7, 10, N'Register', N'Top', 1, N'Oqtane.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (11, 4, 11, N'Administration', N'Top', 1, N'Oqtane.Client.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (11, 4, 11, N'Administration', N'Top', 1, N'Oqtane.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (12, 8, 12, N'Site Management', N'Top', 1, N'Oqtane.Client.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (12, 8, 12, N'Site Management', N'Top', 1, N'Oqtane.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (13, 9, 13, N'User Management', N'Top', 1, N'Oqtane.Client.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (13, 9, 13, N'User Management', N'Top', 1, N'Oqtane.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (14, 10, 14, N'Module Management', N'Top', 1, N'Oqtane.Client.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (14, 10, 14, N'Module Management', N'Top', 1, N'Oqtane.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (15, 11, 15, N'Theme Management', N'Top', 1, N'Oqtane.Client.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (15, 11, 15, N'Theme Management', N'Top', 1, N'Oqtane.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (16, 12, 16, N'Id consectetur', N'Top', 1, N'Oqtane.Client.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (16, 12, 16, N'Id consectetur', N'Top', 1, N'Oqtane.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (17, 13, 17, N'Lorem ipsum', N'Top', 1, N'Oqtane.Client.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (17, 13, 17, N'Lorem ipsum', N'Top', 1, N'Oqtane.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (18, 14, 18, N'Login', N'Top', 1, N'Oqtane.Client.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (18, 14, 18, N'Login', N'Top', 1, N'Oqtane.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (19, 15, 19, N'Register', N'Top', 1, N'Oqtane.Client.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (19, 15, 19, N'Register', N'Top', 1, N'Oqtane.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (20, 16, 20, N'Role Management', N'Top', 1, N'Oqtane.Client.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (20, 16, 20, N'Role Management', N'Top', 1, N'Oqtane.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
 GO
 INSERT [dbo].[PageModule] ([PageModuleId], [PageId], [ModuleId], [Title], [Pane], [Order], [ContainerType], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (21, 17, 21, N'User Profile', N'Top', 1, N'Oqtane.Client.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
+VALUES (21, 17, 21, N'User Profile', N'Top', 1, N'Oqtane.Themes.Theme2.Container2, Oqtane.Client', '', getdate(), '', getdate())
 GO
 SET IDENTITY_INSERT [dbo].[PageModule] OFF 
 GO
diff --git a/Oqtane.Server/wwwroot/css/site.css b/Oqtane.Server/wwwroot/css/site.css
index 193ec6f0..b4bdaf08 100644
--- a/Oqtane.Server/wwwroot/css/site.css
+++ b/Oqtane.Server/wwwroot/css/site.css
@@ -76,6 +76,14 @@ app {
             color: white;
         }
 
+.nav-link[data-toggle].collapsed:after {
+    content: "▾";
+}
+
+.nav-link[data-toggle]:not(.collapsed):after {
+    content: "▴";
+}
+
 .content {
     padding-top: 1.1rem;
 }
diff --git a/Oqtane.Shared/Models/HtmlTextInfo.cs b/Oqtane.Shared/Models/HtmlTextInfo.cs
index c26fa269..e51a41fd 100644
--- a/Oqtane.Shared/Models/HtmlTextInfo.cs
+++ b/Oqtane.Shared/Models/HtmlTextInfo.cs
@@ -3,7 +3,7 @@ using Oqtane.Models;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Oqtane.Shared.Modules.HtmlText.Models
+namespace Oqtane.Modules.HtmlText.Models
 {
     [Table("HtmlText")]
     public class HtmlTextInfo : IAuditable
diff --git a/Oqtane.Shared/Models/Page.cs b/Oqtane.Shared/Models/Page.cs
index c5d9a463..49d22ba6 100644
--- a/Oqtane.Shared/Models/Page.cs
+++ b/Oqtane.Shared/Models/Page.cs
@@ -26,5 +26,9 @@ namespace Oqtane.Models
 
         [NotMapped]
         public string Permissions { get; set; }
+        [NotMapped]
+        public int Level { get; set; }
+        [NotMapped]
+        public bool HasChildren { get; set; }
     }
 }
diff --git a/Oqtane.Shared/Models/Site.cs b/Oqtane.Shared/Models/Site.cs
index 14c5c34a..c9959e95 100644
--- a/Oqtane.Shared/Models/Site.cs
+++ b/Oqtane.Shared/Models/Site.cs
@@ -7,6 +7,8 @@ namespace Oqtane.Models
         public int SiteId { get; set; }
         public string Name { get; set; }
         public string Logo { get; set; }
+        public string DefaultThemeType { get; set; }
+
 
         public string CreatedBy { get; set; }
         public DateTime CreatedOn { get; set; }
diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs
index 08253841..b5f79aa3 100644
--- a/Oqtane.Shared/Shared/Constants.cs
+++ b/Oqtane.Shared/Shared/Constants.cs
@@ -2,12 +2,12 @@
 {
     public class Constants
     {
-        public const string DefaultPage = "Oqtane.Client.Shared.Theme, Oqtane.Client";
-        public const string DefaultContainer = "Oqtane.Client.Shared.Container, Oqtane.Client";
-        public const string DefaultAdminContainer = "Oqtane.Client.Themes.AdminContainer, Oqtane.Client";
-        public const string DefaultSettingsControl = "Oqtane.Client.Modules.Admin.ModuleSettings.Index, Oqtane.Client";
-        public const string PageManagementModule = "Oqtane.Client.Modules.Admin.Pages, Oqtane.Client";
-        public const string ModuleMessageControl = "Oqtane.Client.Modules.Controls.ModuleMessage, Oqtane.Client";
+        public const string DefaultPage = "Oqtane.Shared.ThemeBuilder, Oqtane.Client";
+        public const string DefaultContainer = "Oqtane.Shared.ContainerBuilder, Oqtane.Client";
+        public const string DefaultAdminContainer = "Oqtane.Themes.AdminContainer, Oqtane.Client";
+        public const string DefaultSettingsControl = "Oqtane.Modules.Admin.ModuleSettings.Index, Oqtane.Client";
+        public const string PageManagementModule = "Oqtane.Modules.Admin.Pages, Oqtane.Client";
+        public const string ModuleMessageControl = "Oqtane.Modules.Controls.ModuleMessage, Oqtane.Client";
         public const string DefaultControl = "Index";
 
         public const string AdminPane = "Admin";