diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpDemoSectionTagHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpDemoSectionTagHelper.cs
index eba67494a7..f4b0231362 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpDemoSectionTagHelper.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpDemoSectionTagHelper.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.TagHelpers;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.FileProviders;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Microsoft.AspNetCore.Razor.TagHelpers;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers;
 using Volo.Abp.VirtualFileSystem;
 
@@ -26,17 +28,32 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
 
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
+            output.TagName = null;
+
             var content = await output.GetChildContentAsync();
 
+            output.PreContent.AppendHtml("<div class=\"abp-demo-section\">");
+            output.PreContent.AppendHtml("<div class=\"abp-demo-section-body\">");
+
+            /* component rendering here */
+
+            output.PostContent.AppendHtml("</div>"); //abp-demo-section-body
+
+            output.PostContent.AppendHtml("<div class=\"abp-demo-section-raw-source\">");
             output.PostContent.AppendHtml("<h3>ABP Tag Helpers</h3>");
             output.PostContent.AppendHtml("<pre>");
             output.PostContent.Append(GetRawDemoSource());
             output.PostContent.AppendHtml("</pre>");
-            output.PostContent.AppendHtml("<hr />");
+            output.PostContent.AppendHtml("</div>"); //abp-demo-section-raw-source
+
+            output.PostContent.AppendHtml("<div class=\"abp-demo-section-bs-source\">");
             output.PostContent.AppendHtml("<h3>Bootstrap</h3>");
             output.PostContent.AppendHtml("<pre>");
             output.PostContent.Append(content.GetContent());
             output.PostContent.AppendHtml("</pre>");
+            output.PostContent.AppendHtml("</div>"); //abp-demo-section-bs-source
+
+            output.PostContent.AppendHtml("</div>"); //abp-demo-section
         }
 
         private string GetRawDemoSource()
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/AbpAspNetCoreMvcUiThemeBasicDemoModule.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/AbpAspNetCoreMvcUiThemeBasicDemoModule.cs
index c996ae51e7..5cb2ca838b 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/AbpAspNetCoreMvcUiThemeBasicDemoModule.cs
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/AbpAspNetCoreMvcUiThemeBasicDemoModule.cs
@@ -2,6 +2,8 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo;
 using Volo.Abp.Autofac;
 using Volo.Abp.Modularity;
@@ -28,6 +30,13 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo
                     options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiThemeSharedDemoModule>(Path.Combine(env.ContentRootPath, string.Format("..{0}..{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo", Path.DirectorySeparatorChar)));
                 });
             }
+
+            Configure<AbpBundlingOptions>(options =>
+            {
+                options.StyleBundles
+                    .Get(StandardBundles.Styles.Global)
+                    .AddFiles("/demo/styles/main.css");
+            });
         }
 
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Buttons/Index.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Buttons/Index.cshtml
index bc5f407b27..32b2c376b2 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Buttons/Index.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Buttons/Index.cshtml
@@ -1,6 +1,6 @@
 @page
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.ButtonsDemo
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Buttons.IndexModel
-<h1>Buttons Page</h1>
+<h1>Buttons</h1>
 
 @await Component.InvokeAsync(typeof(ButtonsDemoViewComponent))
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.csproj b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.csproj
index b5093ce9d9..7a95c77246 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.csproj
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.csproj
@@ -8,11 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Remove="Pages\_ViewImports.cshtml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Pages\_ViewImports.cshtml" />
+    <Compile Remove="Logs\**" />
+    <Content Remove="Logs\**" />
+    <EmbeddedResource Remove="Logs\**" />
+    <None Remove="Logs\**" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/wwwroot/demo/styles/main.css b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/wwwroot/demo/styles/main.css
new file mode 100644
index 0000000000..4a83f74d30
--- /dev/null
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/wwwroot/demo/styles/main.css
@@ -0,0 +1,29 @@
+.abp-demo-section {
+    border: 1px solid #999;
+    padding: 10px;
+}
+
+.abp-demo-section-body {
+    padding-bottom: 10px;
+}
+
+.abp-demo-section-raw-source {
+    background-color: #eee;
+    padding: 5px;
+}
+
+    .abp-demo-section-raw-source pre {
+        border: 1px solid #999;
+        margin: 5px;
+    }
+
+
+.abp-demo-section-bs-source {
+    background-color: #ddd;
+    padding: 5px;
+}
+
+    .abp-demo-section-bs-source pre {
+        border: 1px solid #999;
+        margin: 5px;
+    }