diff --git a/src/Identity.API/Views/Shared/_Layout.cshtml b/src/Identity.API/Views/Shared/_Layout.cshtml
index d470953e4..8019e91c3 100644
--- a/src/Identity.API/Views/Shared/_Layout.cshtml
+++ b/src/Identity.API/Views/Shared/_Layout.cshtml
@@ -13,7 +13,7 @@
     <link rel="icon" type="image/x-icon" href="favicon.png">
     <link rel="shortcut icon" type="image/x-icon" href="~/favicon.png" />
 
-    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="~/lib/bootstrap/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" />
 </head>
 <body>
@@ -43,8 +43,8 @@
         </div>
     </footer>
 
-    <script src="~/lib/jquery/dist/jquery.slim.min.js"></script>
-    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
+    <script src="~/lib/jquery/jquery.slim.min.js"></script>
+    <script src="~/lib/bootstrap/js/bootstrap.bundle.min.js"></script>
 
     @RenderSection("scripts", required: false)
 </body>
diff --git a/src/WebApp/Components/Layout/MainLayout.razor b/src/WebApp/Components/Layout/MainLayout.razor
index ab7be4a3b..54719611b 100644
--- a/src/WebApp/Components/Layout/MainLayout.razor
+++ b/src/WebApp/Components/Layout/MainLayout.razor
@@ -1,13 +1,25 @@
 ﻿@using eShop.WebApp.Components.Chatbot
 @inherits LayoutComponentBase
-
-<HeaderBar />
-@Body
-<ShowChatbotButton />
-<FooterBar />
-
+@inject NavigationManager Navigation
+<div class="@GetLayoutClass()">
+    <div>
+        <HeaderBar />
+        @Body
+        <ShowChatbotButton />
+    </div>
+    <FooterBar />
+</div>
 <div id="blazor-error-ui">
     An unhandled error has occurred.
     <a href="" class="reload">Reload</a>
     <a class="dismiss">🗙</a>
 </div>
+
+@code {
+    private string GetLayoutClass()
+    {
+        var currentUrl = Navigation.ToBaseRelativePath(Navigation.Uri);
+        return currentUrl.StartsWith("user/orders") || currentUrl.StartsWith("cart") ? "layout-container sticky-footer-page" :
+        "layout-container";
+    }
+}
\ No newline at end of file
diff --git a/src/WebApp/Components/Layout/MainLayout.razor.css b/src/WebApp/Components/Layout/MainLayout.razor.css
index df8c10ff2..0feaf966f 100644
--- a/src/WebApp/Components/Layout/MainLayout.razor.css
+++ b/src/WebApp/Components/Layout/MainLayout.razor.css
@@ -16,3 +16,13 @@
         right: 0.75rem;
         top: 0.5rem;
     }
+
+.layout-container {
+    min-height: 100vh;
+    display: flex;
+    flex-direction: column;
+}
+
+.layout-container.sticky-footer-page ::deep .eshop-footer {
+    margin-top: auto;
+}
\ No newline at end of file
