diff --git a/src/OrchardCore.Cms.Web/Program.cs b/src/OrchardCore.Cms.Web/Program.cs
index 4b4d39392bd..f5e06716d21 100644
--- a/src/OrchardCore.Cms.Web/Program.cs
+++ b/src/OrchardCore.Cms.Web/Program.cs
@@ -19,4 +19,4 @@
 
 app.UseOrchardCore();
 
-app.Run();
+await app.RunAsync();
diff --git a/src/OrchardCore.Cms.Web/wwwroot/.placeholder b/src/OrchardCore.Cms.Web/wwwroot/.placeholder
index 46b134b197f..8b137891791 100644
--- a/src/OrchardCore.Cms.Web/wwwroot/.placeholder
+++ b/src/OrchardCore.Cms.Web/wwwroot/.placeholder
@@ -1 +1 @@
-��
\ No newline at end of file
+
diff --git a/src/OrchardCore.Modules/OrchardCore.Mvc.HelloWorld/OrchardCore.Mvc.HelloWorld.csproj b/src/OrchardCore.Modules/OrchardCore.Mvc.HelloWorld/OrchardCore.Mvc.HelloWorld.csproj
index c3c14a820a3..8a1dfce9373 100644
--- a/src/OrchardCore.Modules/OrchardCore.Mvc.HelloWorld/OrchardCore.Mvc.HelloWorld.csproj
+++ b/src/OrchardCore.Modules/OrchardCore.Mvc.HelloWorld/OrchardCore.Mvc.HelloWorld.csproj
@@ -4,9 +4,11 @@
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <!-- NuGet properties-->
     <Title>OrchardCore Hello World MVC module </Title>
-    <Description>$(OCFrameworkDescription)
+    <Description>
+      $(OCFrameworkDescription)
 
-    Sample Orchard Core Framework module for MVC.</Description>
+      Sample Orchard Core Framework module for MVC.
+    </Description>
     <PackageTags>$(PackageTags) OrchardCoreFramework</PackageTags>
   </PropertyGroup>
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Mvc.HelloWorld/Views/Home/Index.cshtml b/src/OrchardCore.Modules/OrchardCore.Mvc.HelloWorld/Views/Home/Index.cshtml
index e515ab69c8c..ccd464cbf70 100644
--- a/src/OrchardCore.Modules/OrchardCore.Mvc.HelloWorld/Views/Home/Index.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Mvc.HelloWorld/Views/Home/Index.cshtml
@@ -1 +1,8 @@
-﻿<h1>Hello World</h1>
+
+<div class="card text-bg-light">
+    <div class="card-body text-center">
+        <h2>Hello World</h2>
+        <h3>This message is from the Hello World Module</h3>
+    </div>
+</div>
+
diff --git a/src/OrchardCore.Modules/OrchardCore.Mvc.HelloWorld/Views/_ViewStart.cshtml b/src/OrchardCore.Modules/OrchardCore.Mvc.HelloWorld/Views/_ViewStart.cshtml
new file mode 100644
index 00000000000..2de62418c07
--- /dev/null
+++ b/src/OrchardCore.Modules/OrchardCore.Mvc.HelloWorld/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+﻿@{
+    Layout = "~/Views/Shared/_Layout.cshtml";
+}
diff --git a/src/OrchardCore.Mvc.Web/Program.cs b/src/OrchardCore.Mvc.Web/Program.cs
index d93a0dc32b3..785623cd759 100644
--- a/src/OrchardCore.Mvc.Web/Program.cs
+++ b/src/OrchardCore.Mvc.Web/Program.cs
@@ -15,4 +15,4 @@
 
 app.UseOrchardCore();
 
-app.Run();
+await app.RunAsync();
diff --git a/src/OrchardCore.Mvc.Web/Views/Shared/_Layout.cshtml b/src/OrchardCore.Mvc.Web/Views/Shared/_Layout.cshtml
index d550057bd4a..f27c4bcf269 100644
--- a/src/OrchardCore.Mvc.Web/Views/Shared/_Layout.cshtml
+++ b/src/OrchardCore.Mvc.Web/Views/Shared/_Layout.cshtml
@@ -1,46 +1,42 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - MvcSandbox</title>
-    <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.5/css/bootstrap.min.css" />
-    <style>
-        .body-content {
-            margin-top: 50px;
-        }
-    </style>
+    <title>@ViewData["Title"]</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
 </head>
 <body>
-    <div class="navbar navbar-inverse navbar-fixed-top">
-        <div class="container">
-            <div class="navbar-header">
-                <button type="button" class="navbar-toggle" data-bs-toggle="collapse" data-bs-target=".navbar-collapse">
-                    <span class="visually-hidden">Toggle navigation</span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
+    <header>
+        <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-dark bg-dark border-bottom box-shadow mb-3">
+            <div class="container">
+                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">WebApplication1</a>
+                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
+                        aria-expanded="false" aria-label="Toggle navigation">
+                    <span class="navbar-toggler-icon"></span>
                 </button>
-                <a asp-controller="Home" asp-action="Index" class="navbar-brand">MvcSandbox</a>
+                <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
+                    <ul class="navbar-nav flex-grow-1">
+                        <li class="nav-item">
+                            <a class="nav-link text-light" href="#">Home</a>
+                        </li>
+                    </ul>
+                </div>
             </div>
-            <div class="navbar-collapse collapse">
-                <ul class="nav navbar-nav">
-                    <li><a asp-controller="Home" asp-action="Index">Home</a></li>
-                </ul>
-            </div>
-        </div>
-    </div>
-    <div class="container body-content">
-        @RenderBody()
-        <hr />
-        <footer>
-            <p>&copy; 2015 - MvcSandbox</p>
-        </footer>
+        </nav>
+    </header>
+    <div class="container">
+        <main role="main" class="pb-3">
+            @RenderBody()
+        </main>
     </div>
 
-    <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.1.4.min.js"></script>
-    <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.5/bootstrap.min.js"></script>
-
-    @RenderSection("scripts", required: false)
+    <footer class="border-top footer text-muted">
+        <div class="container text-center">
+            &copy; 2024 - <a href="#">Privacy</a>
+        </div>
+    </footer>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
+    @await RenderSectionAsync("Scripts", required: false)
 </body>
 </html>
