diff --git a/Oqtane.Client/Themes/Controls/Theme/MenuHorizontal.razor b/Oqtane.Client/Themes/Controls/Theme/MenuHorizontal.razor
index ad063ae6..fa6dd129 100644
--- a/Oqtane.Client/Themes/Controls/Theme/MenuHorizontal.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/MenuHorizontal.razor
@@ -10,7 +10,7 @@
         </button>
     </span>
     <div class="app-menu navbar-expand-md">
-        <div class="collapse navbar-collapse" id="Menu">
+        <div class="collapse navbar-collapse navbar-nav-scroll" id="Menu">
             <MenuItemsHorizontal ParentPage="null" Pages="MenuPages" />
         </div>
     </div>
diff --git a/Oqtane.Server/Program.cs b/Oqtane.Server/Program.cs
index 49a5542a..2d762efd 100644
--- a/Oqtane.Server/Program.cs
+++ b/Oqtane.Server/Program.cs
@@ -34,6 +34,7 @@ namespace Oqtane.Server
             WebHost.CreateDefaultBuilder(args)
                 .UseConfiguration(new ConfigurationBuilder()
                     .AddCommandLine(args)
+                    .AddEnvironmentVariables()
                     .Build())
                 .UseStartup<Startup>()
                 .ConfigureLocalizationSettings()
diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
index 2849f410..793c30c2 100644
--- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
+++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
@@ -48,6 +48,7 @@ namespace Oqtane.Repository
             _db.Entry(moduleDefinition).State = EntityState.Modified;
             _db.SaveChanges();
             _permissions.UpdatePermissions(moduleDefinition.SiteId, EntityNames.ModuleDefinition, moduleDefinition.ModuleDefinitionId, moduleDefinition.PermissionList);
+            _cache.Remove("moduledefinitions");
         }
 
         public void DeleteModuleDefinition(int moduleDefinitionId)
diff --git a/Oqtane.Server/Startup.cs b/Oqtane.Server/Startup.cs
index bc8a0aac..9e008722 100644
--- a/Oqtane.Server/Startup.cs
+++ b/Oqtane.Server/Startup.cs
@@ -34,7 +34,8 @@ namespace Oqtane
             var builder = new ConfigurationBuilder()
                 .SetBasePath(env.ContentRootPath)
                 .AddJsonFile("appsettings.json", false, true)
-                .AddJsonFile($"appsettings.{env.EnvironmentName}.json", true, true);
+                .AddJsonFile($"appsettings.{env.EnvironmentName}.json", true, true)
+                .AddEnvironmentVariables();
             Configuration = builder.Build();
 
             _installedCultures = localizationManager.GetInstalledCultures();