diff --git a/BlazorBootstrap.Demo.RCL/Constants/DemoScreenshotSrcConstants.cs b/BlazorBootstrap.Demo.RCL/Constants/DemoScreenshotSrcConstants.cs
index 1cba5995c..dbcf8be79 100644
--- a/BlazorBootstrap.Demo.RCL/Constants/DemoScreenshotSrcConstants.cs
+++ b/BlazorBootstrap.Demo.RCL/Constants/DemoScreenshotSrcConstants.cs
@@ -10,7 +10,7 @@ public class DemoScreenshotSrcConstants
     public const string Home = DemoScreenshotSrcPrefix + "home.png";
 
     // Layout
-    public const string Demos_URL_Layout = DemoScreenshotSrcPrefix + "home.png";
+    public const string Demos_URL_Layout = DemoScreenshotSrcPrefix + "layout.png";
 
     // Content
     public const string Demos_URL_Icons = DemoScreenshotSrcPrefix + "icons.png";
diff --git a/BlazorBootstrap.Demo.RCL/wwwroot/images/screenshots/layout.png b/BlazorBootstrap.Demo.RCL/wwwroot/images/screenshots/layout.png
new file mode 100644
index 000000000..b8c659b22
Binary files /dev/null and b/BlazorBootstrap.Demo.RCL/wwwroot/images/screenshots/layout.png differ
diff --git a/blazorbootstrap/Components/Layout/BlazorBootstrapLayout.razor.cs b/blazorbootstrap/Components/Layout/BlazorBootstrapLayout.razor.cs
index 7d2abbc16..c5783eea7 100644
--- a/blazorbootstrap/Components/Layout/BlazorBootstrapLayout.razor.cs
+++ b/blazorbootstrap/Components/Layout/BlazorBootstrapLayout.razor.cs
@@ -6,16 +6,81 @@ public partial class BlazorBootstrapLayout : BlazorBootstrapLayoutComponentBase
 
     protected override string? ClassNames => BuildClassNames(Class, ("bb-page", true));
 
-    [Parameter] public RenderFragment? ContentSection { get; set; }
-    [Parameter] public string? ContentSectionCssClass { get; set; }
+    /// <summary>
+    /// Gets or sets the content section.
+    /// <para>
+    /// Default value is <see langword="null"/>.
+    /// </para>
+    /// </summary>
+    [AddedVersion("3.2.0")]
+    [DefaultValue(null)]
+    [Description("Gets or sets the content section.")]
+    [Parameter] 
+    public RenderFragment? ContentSection { get; set; }
+
+    /// <summary>
+    /// Gets or sets the CSS class for content section.
+    /// <para>
+    /// Default value is <see langword="null"/>.
+    /// </para>
+    /// </summary>
+    [AddedVersion("3.2.0")]
+    [DefaultValue(null)]
+    [Description("Gets or sets the CSS class for content section.")]
+    [Parameter] 
+    public string? ContentSectionCssClass { get; set; }
+    
     protected string? ContentSectionCssClassNames => BuildClassNames(ContentSectionCssClass, ("p-4", true));
 
-    [Parameter] public RenderFragment? FooterSection { get; set; }
-    [Parameter] public string? FooterSectionCssClass { get; set; } = "bg-body-tertiary";
+    /// <summary>
+    /// Gets or sets the footer section.
+    /// <para>
+    /// Default value is <see langword="null"/>.
+    /// </para>
+    /// </summary>
+    [AddedVersion("3.2.0")]
+    [DefaultValue(null)]
+    [Description("Gets or sets the footer section.")]
+    [Parameter] 
+    public RenderFragment? FooterSection { get; set; }
+
+    /// <summary>
+    /// Gets or sets the CSS class applied to the footer section of the component.
+    /// <para>
+    /// Default value is <see langword="null"/>.
+    /// </para>
+    /// </summary>
+    [AddedVersion("3.2.0")]
+    [DefaultValue("bg-body-tertiary")]
+    [Description("Gets or sets the CSS class applied to the footer section of the component.")]
+    [Parameter] 
+    public string FooterSectionCssClass { get; set; } = "bg-body-tertiary";
+    
     protected string? FooterSectionCssClassNames => BuildClassNames(FooterSectionCssClass, ("bb-footer p-4", true));
 
-    [Parameter] public RenderFragment? HeaderSection { get; set; }
-    [Parameter] public string? HeaderSectionCssClass { get; set; } = "d-flex justify-content-end";
+    /// <summary>
+    /// Gets or sets the header section.
+    /// <para>
+    /// Default value is <see langword="null"/>.
+    /// </para>
+    /// </summary>
+    [AddedVersion("3.2.0")]
+    [DefaultValue(null)]
+    [Description("Gets or sets the header section.")]
+    [Parameter] 
+    public RenderFragment? HeaderSection { get; set; }
+
+    /// <summary>
+    /// Gets or sets the CSS class applied to the header section of the component.
+    /// <para>
+    /// Default value is <see langword="null"/>.
+    /// </para>
+    /// </summary>
+    [AddedVersion("3.2.0")]
+    [DefaultValue("d-flex justify-content-end")]
+    [Description("Gets or sets the CSS class applied to the header section of the component.")]
+    [Parameter] 
+    public string HeaderSectionCssClass { get; set; } = "d-flex justify-content-end";
 
     protected string? HeaderSectionCssClassNames =>
         BuildClassNames(
@@ -25,9 +90,29 @@ public partial class BlazorBootstrapLayout : BlazorBootstrapLayoutComponentBase
             ("px-4", true)
         );
 
-    [Parameter] public bool StickyHeader { get; set; }
+    /// <summary>
+    /// Gets or sets a value indicating whether the header section is sticky.
+    /// <para>
+    /// Default value is <see langword="false"/>.
+    /// </para>
+    /// </summary>
+    [AddedVersion("3.2.0")]
+    [DefaultValue(false)]
+    [Description("Gets or sets a value indicating whether the header section is sticky.")]
+    [Parameter] 
+    public bool StickyHeader { get; set; }
 
-    [Parameter] public RenderFragment? SidebarSection { get; set; }
+    /// <summary>
+    /// Gets or sets the sidebar section.
+    /// <para>
+    /// Default value is <see langword="null"/>.
+    /// </para>
+    /// </summary>
+    [AddedVersion("3.2.0")]
+    [DefaultValue(null)]
+    [Description("Gets or sets the sidebar section.")]
+    [Parameter] 
+    public RenderFragment? SidebarSection { get; set; }
 
     #endregion
 }