diff --git a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
index bf62b5c5..dc723002 100644
--- a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
+++ b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Themes.BlazorTheme
+@namespace Oqtane.Themes.BlazorTheme
 @inherits ThemeBase
 
 <div class="breadcrumbs">
@@ -19,9 +19,6 @@
         <div class="row px-4">
             <Pane Name="Content" />
         </div>
-        <div class="row px-4">
-            <Pane Name="Admin" />
-        </div>
     </div>
 </div>
 
diff --git a/Oqtane.Client/Themes/Controls/ModuleActions.razor b/Oqtane.Client/Themes/Controls/ModuleActions.razor
index dbc8c15b..2468bf89 100644
--- a/Oqtane.Client/Themes/Controls/ModuleActions.razor
+++ b/Oqtane.Client/Themes/Controls/ModuleActions.razor
@@ -2,33 +2,41 @@
 @inherits ModuleActionsBase 
 @attribute [OqtaneIgnore]
 
-@if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, ModuleState.Permissions))
+@if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, ModuleState.Permissions) && PageState.Action == Constants.DefaultAction)
 {
     <div class="app-moduleactions">
         <a class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"></a>
-        <div class="dropdown-menu" x-placement="bottom-start" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(0px, 37px, 0px);">
-            @foreach (var action in Actions)
+        <ul class="dropdown-menu" x-placement="bottom-start" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(0px, 37px, 0px);">
+            @foreach (var action in Actions.Where(item => !item.Name.Contains("Pane")))
             {
                 if (string.IsNullOrEmpty(action.Name))
                 {
-                    <div class="dropdown-divider"></div>
+                    <li class="dropdown-divider"></li>
                 }
                 else
                 {
-                    <a class="dropdown-item" @onclick="(async () => await ModuleAction(action))">
-                        @if (string.IsNullOrEmpty(action.Icon))
-                        {
-                            @((MarkupString) "&nbsp;&nbsp;");
-                        }
-                        else
-                        {
-                            <span class="@action.Icon" aria-hidden="true"></span>
-                        }
-                        &nbsp;
-                        @action.Name
-                    </a>
+                    <li>
+                        <a class="dropdown-item" @onclick="(async () => await ModuleAction(action))">
+                            <span class="@action.Icon" aria-hidden="true"></span>&nbsp;@action.Name
+                        </a>
+                    </li>
                 }
             }
-        </div>
+            <li class="dropdown-submenu">
+                <a class="dropdown-item" onclick="return subMenu(this)">
+                    <span class="@Icons.AccountLogin" aria-hidden="true"></span>&nbsp;Move To &gt;
+                </a>
+                <ul class="dropdown-menu">
+                    @foreach (var action in Actions.Where(item => item.Name.Contains("Pane")))
+                    {
+                        <li>
+                            <a class="dropdown-item" @onclick="(async () => await ModuleAction(action))">
+                                <span class="@action.Icon" aria-hidden="true"></span>&nbsp;@action.Name
+                            </a>
+                        </li>
+                    }
+                </ul>
+            </li>
+        </ul>
     </div>
 }
diff --git a/Oqtane.Client/Themes/Controls/ModuleActionsBase.cs b/Oqtane.Client/Themes/Controls/ModuleActionsBase.cs
index b0e95901..3551b897 100644
--- a/Oqtane.Client/Themes/Controls/ModuleActionsBase.cs
+++ b/Oqtane.Client/Themes/Controls/ModuleActionsBase.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -76,7 +76,7 @@ namespace Oqtane.Themes.Controls
                 {
                     if (pane != ModuleState.Pane)
                     {
-                        actionList.Add(new ActionViewModel {Icon = Icons.AccountLogin, Name = "Move To " + pane + " Pane", Action = async (s, m) => await MoveToPane(s, pane, m)});
+                        actionList.Add(new ActionViewModel {Icon = Icons.AccountLogin, Name = pane + " Pane", Action = async (s, m) => await MoveToPane(s, pane, m)});
                     }
                 }
             }
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Containers/DefaultNoTitle.razor b/Oqtane.Client/Themes/OqtaneTheme/Containers/DefaultNoTitle.razor
new file mode 100644
index 00000000..b236edda
--- /dev/null
+++ b/Oqtane.Client/Themes/OqtaneTheme/Containers/DefaultNoTitle.razor
@@ -0,0 +1,10 @@
+@namespace Oqtane.Themes.OqtaneTheme
+@inherits ContainerBase
+
+<div class="container">
+    <ModuleActions /><ModuleInstance />
+</div>
+
+@code {
+    public override string Name => "No Background Color - No Title";
+}
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor b/Oqtane.Client/Themes/OqtaneTheme/Containers/DefaultTitle.razor
similarity index 76%
rename from Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor
rename to Oqtane.Client/Themes/OqtaneTheme/Containers/DefaultTitle.razor
index 6d0148fa..0ba6af46 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Containers/DefaultTitle.razor
@@ -1,5 +1,6 @@
-@namespace Oqtane.Themes.OqtaneTheme
+@namespace Oqtane.Themes.OqtaneTheme
 @inherits ContainerBase
+
 <div class="container">
     <div class="row px-4">
         <div class="d-flex flex-nowrap">
@@ -15,5 +16,5 @@
 </div>
 
 @code {
-    public override string Name => "Standard Header";
+    public override string Name => "No Background Color - With Title";
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Containers/NoTitle.razor b/Oqtane.Client/Themes/OqtaneTheme/Containers/NoTitle.razor
deleted file mode 100644
index 082bbe5a..00000000
--- a/Oqtane.Client/Themes/OqtaneTheme/Containers/NoTitle.razor
+++ /dev/null
@@ -1,13 +0,0 @@
-@namespace Oqtane.Themes.OqtaneTheme
-@inherits ContainerBase
-<div class="container">
-    @if (PageState.EditMode)
-    {
-        <ModuleActions />
-    }
-    <ModuleInstance />
-</div>
-
-@code {
-    public override string Name => "No Header";
-}
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Containers/PrimaryNoTitle.razor b/Oqtane.Client/Themes/OqtaneTheme/Containers/PrimaryNoTitle.razor
new file mode 100644
index 00000000..7c7463f6
--- /dev/null
+++ b/Oqtane.Client/Themes/OqtaneTheme/Containers/PrimaryNoTitle.razor
@@ -0,0 +1,10 @@
+@namespace Oqtane.Themes.OqtaneTheme
+@inherits ContainerBase
+
+<div class="container bg-primary">
+    <ModuleActions /><ModuleInstance />
+</div>
+
+@code {
+    public override string Name => "Primary Background Color - No Title";
+}
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Containers/PrimaryTitle.razor b/Oqtane.Client/Themes/OqtaneTheme/Containers/PrimaryTitle.razor
new file mode 100644
index 00000000..99cd8ff0
--- /dev/null
+++ b/Oqtane.Client/Themes/OqtaneTheme/Containers/PrimaryTitle.razor
@@ -0,0 +1,20 @@
+@namespace Oqtane.Themes.OqtaneTheme
+@inherits ContainerBase
+
+<div class="container bg-primary">
+    <div class="row px-4">
+        <div class="d-flex flex-nowrap">
+            <ModuleActions /><h2><ModuleTitle /></h2>
+        </div>
+        <hr class="app-rule" />
+    </div>
+    <div class="row px-4">
+        <div class="container">
+            <ModuleInstance />
+        </div>
+    </div>
+</div>
+
+@code {
+    public override string Name => "Primary Background Color - With Title";
+}
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Containers/SecondaryNoTitle.razor b/Oqtane.Client/Themes/OqtaneTheme/Containers/SecondaryNoTitle.razor
new file mode 100644
index 00000000..2a8a40cc
--- /dev/null
+++ b/Oqtane.Client/Themes/OqtaneTheme/Containers/SecondaryNoTitle.razor
@@ -0,0 +1,10 @@
+@namespace Oqtane.Themes.OqtaneTheme
+@inherits ContainerBase
+
+<div class="container bg-secondary">
+    <ModuleActions /><ModuleInstance />
+</div>
+
+@code {
+    public override string Name => "Secondary Background Color - No Title";
+}
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Containers/SecondaryTitle.razor b/Oqtane.Client/Themes/OqtaneTheme/Containers/SecondaryTitle.razor
new file mode 100644
index 00000000..5d033cec
--- /dev/null
+++ b/Oqtane.Client/Themes/OqtaneTheme/Containers/SecondaryTitle.razor
@@ -0,0 +1,20 @@
+@namespace Oqtane.Themes.OqtaneTheme
+@inherits ContainerBase
+
+<div class="container bg-secondary">
+    <div class="row px-4">
+        <div class="d-flex flex-nowrap">
+            <ModuleActions /><h2><ModuleTitle /></h2>
+        </div>
+        <hr class="app-rule" />
+    </div>
+    <div class="row px-4">
+        <div class="container">
+            <ModuleInstance />
+        </div>
+    </div>
+</div>
+
+@code {
+    public override string Name => "Secondary Background Color - With Title";
+}
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Layouts/MultiPane.razor b/Oqtane.Client/Themes/OqtaneTheme/Layouts/MultiPane.razor
index b40d1989..128720ce 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Layouts/MultiPane.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Layouts/MultiPane.razor
@@ -1,20 +1,90 @@
-@namespace Oqtane.Themes.OqtaneTheme
+@namespace Oqtane.Themes.OqtaneTheme
 @inherits LayoutBase
 
-<div class="row px-4">
-    <Pane Name="Top" />
+<div class="container">
+    <div class="row">
+        <div class="col-md-12">
+            <Pane Name="Content" />
+        </div>
+    </div>
 </div>
-<div class="row px-4">
-    <div class="col-sm"><Pane Name="Left" /></div>
-    <div class="col-sm"><Pane Name="Content" /></div>
-    <div class="col-sm"><Pane Name="Right" /></div>
-</div>
-<div class="row px-4">
-    <Pane Name="Bottom" />
+<Pane Name="Top Full Width" />
+<div class="container">
+    <div class="row">
+        <div class="col-md-12">
+            <Pane Name="Top 100%" />
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-6">
+            <Pane Name="Left 50%" />
+        </div>
+        <div class="col-md-6">
+            <Pane Name="Right 50%" />
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-4">
+            <Pane Name="Left 33%" />
+        </div>
+        <div class="col-md-4">
+            <Pane Name="Center 33%" />
+        </div>
+        <div class="col-md-4">
+            <Pane Name="Right 33%" />
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-3">
+            <Pane Name="Left Outer 25%" />
+        </div>
+        <div class="col-md-3">
+            <Pane Name="Left Inner 25%" />
+        </div>
+        <div class="col-md-3">
+            <Pane Name="Right Inner 25%" />
+        </div>
+        <div class="col-md-3">
+            <Pane Name="Right Outer 25%" />
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-3">
+            <Pane Name="Left 25%" />
+        </div>
+        <div class="col-md-6">
+            <Pane Name="Center 50%" />
+        </div>
+        <div class="col-md-3">
+            <Pane Name="Right 25%" />
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-8">
+            <Pane Name="Left Sidebar 66%" />
+        </div>
+        <div class="col-md-4">
+            <Pane Name="Right Sidebar 33%" />
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-4">
+            <Pane Name="Left Sidebar 33%" />
+        </div>
+        <div class="col-md-8">
+            <Pane Name="Right Sidebar 66%" />
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            <Pane Name="Bottom 100%" />
+        </div>
+    </div>
 </div>
+<Pane Name="Bottom Full Width" />
 
 @code {
     public override string Name => "Multiple Panes";
 
-    public override string Panes => "Top,Left,Content,Right,Bottom";
+    public override string Panes => "Content, Top Full Width,Top 100%,Left 50%,Right 50%,Left 33%,Center 33%,Right 33%,Left Outer 25%,Left Inner 25%,Right Inner 25%,Right Outer 25%,Left 25%,Center 50%,Right 25%,Left Sidebar 66%,Right Sidebar 33%,Left Sidebar 33%,Right Sidebar 66%,Bottom 100%,Bottom Full Width";
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Layouts/SinglePane.razor b/Oqtane.Client/Themes/OqtaneTheme/Layouts/SinglePane.razor
index 864209e1..6f808141 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Layouts/SinglePane.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Layouts/SinglePane.razor
@@ -1,12 +1,16 @@
-@namespace Oqtane.Themes.OqtaneTheme
+@namespace Oqtane.Themes.OqtaneTheme
 @inherits LayoutBase
 
-<div class="row px-4">
-    <Pane Name="Content" />
+<div class="container">
+    <div class="row">
+        <div class="col-md-12">
+            <Pane Name="Content" />
+        </div>
+    </div>
 </div>
 
 @code {
     public override string Name => "Single Pane";
 
     public override string Panes => "Content";
-}
\ No newline at end of file
+}
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
index 1878ed09..8b566485 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Themes.OqtaneTheme
+@namespace Oqtane.Themes.OqtaneTheme
 @inherits ThemeBase
 
 <main role="main">
@@ -8,16 +8,11 @@
             <div class="controls-group"><UserProfile /> <Login /> <ControlPanel /></div>
         </div>
     </nav>
-    <div class="content container">
-        <PaneLayout />
-        <div class="row px-4">
-            <Pane Name="Admin" />
-        </div>
-    </div>
+    <PaneLayout />
 </main>
 
 @code {
-    public override string Name => "Default";
+    public override string Name => "Default Theme";
 
     public override string Panes => string.Empty;
 
diff --git a/Oqtane.Client/UI/ContainerBuilder.razor b/Oqtane.Client/UI/ContainerBuilder.razor
index 6992c34a..174f251f 100644
--- a/Oqtane.Client/UI/ContainerBuilder.razor
+++ b/Oqtane.Client/UI/ContainerBuilder.razor
@@ -1,11 +1,21 @@
 @namespace Oqtane.UI
 
 <CascadingValue Value="@_moduleState" IsFixed="true">
-    @DynamicComponent
+    @if (_useadminborder)
+    {
+        <div class="app-pane-admin-border">
+            @DynamicComponent
+        </div>
+    }
+    else
+    {
+        @DynamicComponent
+    }
 </CascadingValue>
 
 @code {
     private Module _moduleState;
+    private bool _useadminborder = false;
 
     [CascadingParameter]
     protected PageState PageState { get; set; }
@@ -24,6 +34,15 @@
             container = (!string.IsNullOrEmpty(PageState.Site.AdminContainerType)) ? PageState.Site.AdminContainerType : Constants.DefaultAdminContainer;
         }
 
+        if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions) && PageState.Action == Constants.DefaultAction)
+        {
+            _useadminborder = true;
+        }
+        else
+        {
+            _useadminborder = false;
+        }
+
         DynamicComponent = builder =>
         {
             Type containerType = Type.GetType(container);
diff --git a/Oqtane.Client/UI/Pane.razor b/Oqtane.Client/UI/Pane.razor
index 139135b9..fe71f45e 100644
--- a/Oqtane.Client/UI/Pane.razor
+++ b/Oqtane.Client/UI/Pane.razor
@@ -6,7 +6,7 @@
 
 @if (_useadminborder)
 {
-    <div class="@_paneadminborder">
+    <div class="app-pane-admin-border">
         @((MarkupString)_panetitle)
         @DynamicComponent
     </div>
@@ -18,7 +18,6 @@ else
 
 @code {
     private bool _useadminborder = false;
-    private string _paneadminborder = "app-pane-admin-border";
     private string _panetitle = "";
 
     [CascadingParameter]
@@ -31,7 +30,7 @@ else
 
     protected override void OnParametersSet()
     {
-        if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions) && Name != PaneNames.Admin)
+        if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions) && PageState.Action == Constants.DefaultAction)
         {
             _useadminborder = true;
             _panetitle = "<div class=\"app-pane-admin-title\">" + Name + " Pane</div>";
diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
index e21629d8..2c7f6603 100644
--- a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
+++ b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
@@ -48,7 +48,7 @@ namespace Oqtane.SiteTemplates
                     new Permission(PermissionNames.Edit, RoleNames.Admin, true)
                 }.EncodePermissions() ,
                 PageTemplateModules = new List<PageTemplateModule> {
-                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Welcome To Oqtane...", Pane = "Content", 
+                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Welcome To Oqtane...", Pane = PaneNames.Admin, 
                         ModulePermissions = new List<Permission> {
                             new Permission(PermissionNames.View, RoleNames.Everyone, true),
                             new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -70,7 +70,7 @@ namespace Oqtane.SiteTemplates
                         "<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>" +
                         "<p>THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>"
                     },
-                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = "Content",
+                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission> {
                             new Permission(PermissionNames.View, RoleNames.Registered, true),
                             new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -94,7 +94,7 @@ namespace Oqtane.SiteTemplates
                     new Permission(PermissionNames.Edit, RoleNames.Admin, true)
                 }.EncodePermissions(),
                 PageTemplateModules = new List<PageTemplateModule> {
-                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = "Content",
+                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission> {
                             new Permission(PermissionNames.View, RoleNames.Registered, true),
                             new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -118,7 +118,7 @@ namespace Oqtane.SiteTemplates
                     new Permission(PermissionNames.Edit, RoleNames.Admin, true)
                 }.EncodePermissions(),
                 PageTemplateModules = new List<PageTemplateModule> {
-                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "My Page", Pane = "Content",
+                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "My Page", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission> {
                             new Permission(PermissionNames.View, RoleNames.Everyone, true),
                             new Permission(PermissionNames.View, RoleNames.Admin, true),
diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
index 6048456f..b871e0d5 100644
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@@ -20,6 +20,9 @@
     <Compile Remove="wwwroot\Modules\Templates\**" />
     <Content Remove="wwwroot\Modules\Templates\**" />
     <EmbeddedResource Remove="wwwroot\Modules\Templates\**" />
+    <Compile Remove="wwwroot\Themes\Templates\**" />
+    <Content Remove="wwwroot\Themes\Templates\**" />
+    <EmbeddedResource Remove="wwwroot\Themes\Templates\**" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Scripts\Master.00.00.00.00.sql" />
@@ -37,6 +40,7 @@
     <EmbeddedResource Include="Scripts\Tenant.02.00.01.02.sql" />
     <EmbeddedResource Include="Scripts\Tenant.02.00.01.03.sql" />
     <EmbeddedResource Include="Scripts\Tenant.02.00.02.01.sql" />
+    <EmbeddedResource Include="Scripts\Tenant.02.00.02.02.sql" />
     <EmbeddedResource Include="Modules\HtmlText\Scripts\HtmlText.1.0.0.sql" />
     <EmbeddedResource Include="Modules\HtmlText\Scripts\HtmlText.Uninstall.sql" />
   </ItemGroup>
diff --git a/Oqtane.Server/Pages/_Host.cshtml b/Oqtane.Server/Pages/_Host.cshtml
index 1678969c..74b13c99 100644
--- a/Oqtane.Server/Pages/_Host.cshtml
+++ b/Oqtane.Server/Pages/_Host.cshtml
@@ -15,6 +15,7 @@
     <!-- stub the PWA manifest but defer the assignment of href -->
     <link id="app-manifest" rel="manifest" />
     <link rel="stylesheet" href="css/app.css" />
+    <script src="js/app.js"></script>
     <script src="js/loadjs.min.js"></script>
     @Html.Raw(@Model.HeadResources)
 </head>
diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs
index 927871c1..af4f2b06 100644
--- a/Oqtane.Server/Repository/SiteRepository.cs
+++ b/Oqtane.Server/Repository/SiteRepository.cs
@@ -68,7 +68,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Login.Index).ToModuleDefinitionName(), Title = "User Login", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Login.Index).ToModuleDefinitionName(), Title = "User Login", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -97,7 +97,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Register.Index).ToModuleDefinitionName(), Title = "User Registration", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Register.Index).ToModuleDefinitionName(), Title = "User Registration", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -127,7 +127,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Reset.Index).ToModuleDefinitionName(), Title = "Password Reset", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Reset.Index).ToModuleDefinitionName(), Title = "Password Reset", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -156,7 +156,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.UserProfile.Index).ToModuleDefinitionName(), Title = "User Profile", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.UserProfile.Index).ToModuleDefinitionName(), Title = "User Profile", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -181,7 +181,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Dashboard.Index).ToModuleDefinitionName(), Title = "Admin Dashboard", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Dashboard.Index).ToModuleDefinitionName(), Title = "Admin Dashboard", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -208,7 +208,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Site.Index).ToModuleDefinitionName(), Title = "Site Settings", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Site.Index).ToModuleDefinitionName(), Title = "Site Settings", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -235,7 +235,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Pages.Index).ToModuleDefinitionName(), Title = "Page Management", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Pages.Index).ToModuleDefinitionName(), Title = "Page Management", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -262,7 +262,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Users.Index).ToModuleDefinitionName(), Title = "User Management", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Users.Index).ToModuleDefinitionName(), Title = "User Management", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -289,7 +289,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Profiles.Index).ToModuleDefinitionName(), Title = "Profile Management", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Profiles.Index).ToModuleDefinitionName(), Title = "Profile Management", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -316,7 +316,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Roles.Index).ToModuleDefinitionName(), Title = "Role Management", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Roles.Index).ToModuleDefinitionName(), Title = "Role Management", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -343,7 +343,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Files.Index).ToModuleDefinitionName(), Title = "File Management", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Files.Index).ToModuleDefinitionName(), Title = "File Management", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -370,7 +370,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.RecycleBin.Index).ToModuleDefinitionName(), Title = "Recycle Bin", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.RecycleBin.Index).ToModuleDefinitionName(), Title = "Recycle Bin", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -399,7 +399,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Logs.Index).ToModuleDefinitionName(), Title = "Event Log", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Logs.Index).ToModuleDefinitionName(), Title = "Event Log", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Host, true),
@@ -421,7 +421,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sites.Index).ToModuleDefinitionName(), Title = "Site Management", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sites.Index).ToModuleDefinitionName(), Title = "Site Management", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Host, true),
@@ -443,7 +443,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.ModuleDefinitions.Index).ToModuleDefinitionName(), Title = "Module Management", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.ModuleDefinitions.Index).ToModuleDefinitionName(), Title = "Module Management", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Host, true),
@@ -465,7 +465,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Themes.Index).ToModuleDefinitionName(), Title = "Theme Management", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Themes.Index).ToModuleDefinitionName(), Title = "Theme Management", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Host, true),
@@ -494,7 +494,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Languages.Index).ToModuleDefinitionName(), Title = "Language Management", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Languages.Index).ToModuleDefinitionName(), Title = "Language Management", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Host, true),
@@ -518,7 +518,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Jobs.Index).ToModuleDefinitionName(), Title = "Scheduled Jobs", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Jobs.Index).ToModuleDefinitionName(), Title = "Scheduled Jobs", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Host, true),
@@ -540,7 +540,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sql.Index).ToModuleDefinitionName(), Title = "Sql Management", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sql.Index).ToModuleDefinitionName(), Title = "Sql Management", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Host, true),
@@ -562,7 +562,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.SystemInfo.Index).ToModuleDefinitionName(), Title = "System Info", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.SystemInfo.Index).ToModuleDefinitionName(), Title = "System Info", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Host, true),
@@ -584,7 +584,7 @@ namespace Oqtane.Repository
                 {
                     new PageTemplateModule
                     {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Upgrade.Index).ToModuleDefinitionName(), Title = "System Update", Pane = "Content",
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Upgrade.Index).ToModuleDefinitionName(), Title = "System Update", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission>
                         {
                             new Permission(PermissionNames.View, RoleNames.Host, true),
diff --git a/Oqtane.Server/Scripts/Tenant.02.00.02.02.sql b/Oqtane.Server/Scripts/Tenant.02.00.02.02.sql
new file mode 100644
index 00000000..64a08e76
--- /dev/null
+++ b/Oqtane.Server/Scripts/Tenant.02.00.02.02.sql
@@ -0,0 +1,20 @@
+/*  
+
+Version 2.0.2 Tenant migration script
+
+*/
+
+UPDATE [dbo].[Site] SET DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client' WHERE DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client';
+GO
+UPDATE [dbo].[Site] SET DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client' WHERE DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.NoTitle, Oqtane.Client';
+GO
+
+UPDATE [dbo].[Page] SET DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client' WHERE DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client';
+GO
+UPDATE [dbo].[Page] SET DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client' WHERE DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.NoTitle, Oqtane.Client';
+GO
+
+UPDATE [dbo].[PageModule] SET ContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client' WHERE ContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client';
+GO
+UPDATE [dbo].[PageModule] SET ContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client' WHERE ContainerType = 'Oqtane.Themes.OqtaneTheme.NoTitle, Oqtane.Client';
+GO
diff --git a/Oqtane.Server/wwwroot/css/app.css b/Oqtane.Server/wwwroot/css/app.css
index eebf63a6..35a44e3f 100644
--- a/Oqtane.Server/wwwroot/css/app.css
+++ b/Oqtane.Server/wwwroot/css/app.css
@@ -90,6 +90,17 @@ app {
     color: gray;
 }
 
+.app-moduleactions .dropdown-submenu {
+    position: relative;
+}
+
+    .app-moduleactions .dropdown-submenu > .dropdown-menu {
+        top: 0;
+        left: 100%;
+        margin-top: 0px;
+        margin-left: 0px;
+    }
+
 .app-progress-indicator {
     background: rgba(0,0,0,0.2) url('../loading.gif') no-repeat 50% 50%;
     width: 100%;
@@ -214,4 +225,4 @@ app {
     position: absolute;
     right: 0.75rem;
     top: 0.5rem;
-}
\ No newline at end of file
+}
diff --git a/Oqtane.Server/wwwroot/js/app.js b/Oqtane.Server/wwwroot/js/app.js
new file mode 100644
index 00000000..2c5d837e
--- /dev/null
+++ b/Oqtane.Server/wwwroot/js/app.js
@@ -0,0 +1,8 @@
+function subMenu(a) {
+    event.preventDefault();
+    event.stopPropagation();
+
+    var li = a.parentElement, submenu = li.getElementsByTagName('ul')[0];
+    submenu.style.display = submenu.style.display == "block" ? "none" : "block";
+    return false;
+}
\ No newline at end of file
diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs
index 60106dd2..89d0e9a7 100644
--- a/Oqtane.Shared/Shared/Constants.cs
+++ b/Oqtane.Shared/Shared/Constants.cs
@@ -13,7 +13,7 @@ namespace Oqtane.Shared {
 
         public const string DefaultTheme = "Oqtane.Themes.OqtaneTheme.Default, Oqtane.Client";
         public const string DefaultLayout = "Oqtane.Themes.OqtaneTheme.SinglePane, Oqtane.Client";
-        public const string DefaultContainer = "Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client";
+        public const string DefaultContainer = "Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client";
         public const string DefaultAdminContainer = "Oqtane.Themes.AdminContainer, Oqtane.Client";
 
         public const string ActionToken = "{Action}";
diff --git a/Oqtane.Shared/Shared/PaneNames.cs b/Oqtane.Shared/Shared/PaneNames.cs
index 063924f9..7806f821 100644
--- a/Oqtane.Shared/Shared/PaneNames.cs
+++ b/Oqtane.Shared/Shared/PaneNames.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace Oqtane.Shared {
     public class PaneNames {
-        public const string Admin = "Admin";
+        public const string Admin = "Content";
     }
 }