diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/Helper.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/Helper.cs
new file mode 100644
index 0000000000..3d653e2351
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/Helper.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using System.Dynamic;
+
+namespace Volo.CmsKit.Web.Contents;
+
+public static class Helper
+{
+    public static dynamic ConvertToDynamicObject(this Dictionary<string, object> dict)
+    {
+        var eo = new ExpandoObject();
+        var eoColl = (ICollection<KeyValuePair<string, object>>)eo;
+
+        foreach (var kvp in dict)
+        {
+            eoColl.Add(kvp);
+        }
+
+        dynamic eoDynamic = eo;
+
+        return eoDynamic;
+    }
+}
+
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml
index b7ead0592a..f104551911 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml
@@ -12,6 +12,8 @@
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Tags
 @using Volo.CmsKit.Public.Web.Renderers
 @using Volo.Abp.AspNetCore.Mvc.UI.Packages.HighlightJs
+@using Volo.CmsKit.Contents
+@using Volo.CmsKit.Web.Contents;
 
 @inherits CmsKitPublicPageBase
 
@@ -26,57 +28,57 @@
 }
 
 @section styles{
-     @if (isScrollIndexEnabled)
-     {
-         <abp-abp-style-bundle>
-             <abp-style src="/Pages/Public/CmsKit/Blogs/bootstrap-toc.css"/>
-         </abp-abp-style-bundle>
-     }
+    @if (isScrollIndexEnabled)
+    {
+        <abp-abp-style-bundle>
+            <abp-style src="/Pages/Public/CmsKit/Blogs/bootstrap-toc.css" />
+        </abp-abp-style-bundle>
+    }
     <abp-abp-style-bundle>
-        <abp-style src="/Pages/Public/CmsKit/Blogs/blogPost.css"/>
-        <abp-style type="typeof(HighlightJsStyleContributor)"/>
+        <abp-style src="/Pages/Public/CmsKit/Blogs/blogPost.css" />
+        <abp-style type="typeof(HighlightJsStyleContributor)" />
     </abp-abp-style-bundle>
 }
 
-@section scripts{
+    @section scripts{
     @if (isScrollIndexEnabled)
     {
         <abp-script-bundle>
-            <abp-style src="/Pages/Public/CmsKit/Blogs/bootstrap-toc.js"/>
-             <abp-script src="/Pages/Public/CmsKit/Blogs/blogpost-scroll-index.js"/>
+            <abp-style src="/Pages/Public/CmsKit/Blogs/bootstrap-toc.js" />
+            <abp-script src="/Pages/Public/CmsKit/Blogs/blogpost-scroll-index.js" />
         </abp-script-bundle>
     }
 
     <abp-script-bundle>
-        <abp-script type="typeof(HighlightJsScriptContributor)"/>
-        <abp-script src="/Pages/Public/CmsKit/highlightOnLoad.js"/>
+        <abp-script type="typeof(HighlightJsScriptContributor)" />
+        <abp-script src="/Pages/Public/CmsKit/highlightOnLoad.js" />
     </abp-script-bundle>
 }
 
 
-<div class="row">
-    <div @Html.Raw(isScrollIndexEnabled ? "class=\"col-md-10 col-sm-12\"" : "class=\"col-md-12\"")>
-        <abp-card class="mb-4">
-            <img src="/api/cms-kit/media/@Model.BlogPost.CoverImageMediaId" class="card-img-top" onerror="this.src='@dummyImageSource'"/>
-            <abp-card-body>
-                <abp-row>
-                    <div class="col-lg-8 col-md-10 mx-auto pb-4">
-                        <h1 class="mt-lg-4 mt-md-3">@Model.BlogPost.Title</h1>
-                        <p class="mb-lg-5 mb-md-3">
-                            <a href="/blogs/@Model.BlogSlug?authorId=@Model.BlogPost.Author.Id">
-                                <span class="font-weight-bold">@@@Model.BlogPost.Author?.UserName</span>
-                            </a>
-                            <small style="opacity:.65;">@Model.BlogPost.CreationTime</small>
-                        </p>
-                        @foreach (var contentFragment in Model.BlogPost.ContentFragments)
+    <div class="row">
+        <div @Html.Raw(isScrollIndexEnabled ? "class=\"col-md-10 col-sm-12\"" : "class=\"col-md-12\"")>
+            <abp-card class="mb-4">
+                <img src="/api/cms-kit/media/@Model.BlogPost.CoverImageMediaId" class="card-img-top" onerror="this.src='@dummyImageSource'" />
+                <abp-card-body>
+                    <abp-row>
+                        <div class="col-lg-8 col-md-10 mx-auto pb-4">
+                            <h1 class="mt-lg-4 mt-md-3">@Model.BlogPost.Title</h1>
+                            <p class="mb-lg-5 mb-md-3">
+                                <a href="/blogs/@Model.BlogSlug?authorId=@Model.BlogPost.Author.Id">
+                                    <span class="font-weight-bold">@@@Model.BlogPost.Author?.UserName</span>
+                                </a>
+                                <small style="opacity:.65;">@Model.BlogPost.CreationTime</small>
+                            </p>
+                            @foreach (var contentFragment in Model.BlogPost.ContentFragments)
                         {
-                            if (contentFragment.Type == "Markdown") //TODO: Constant
+                            if (contentFragment.Type == ContentConsts.Markdown)
                             {
                                 @Html.Raw(await MarkdownRenderer.RenderAsync(contentFragment.GetProperty<string>("Content")))
                             }
-                            else if (contentFragment.Type == "Widget") //TODO: Constant
+                            else if (contentFragment.Type == ContentConsts.Widget)
                             {
-                                @await Component.InvokeAsync(contentFragment.GetProperty<string>("Type"), ConvertToDynamicObject(contentFragment.ExtraProperties))
+                                @await Component.InvokeAsync(contentFragment.GetProperty<string>("Type"), contentFragment.ExtraProperties.ConvertToDynamicObject())
                             }
                         }
                         <p class="mb-3">
@@ -85,18 +87,18 @@
                                 <small style="opacity:.65;">@L["LastModification"].Value : @Model.BlogPost.LastModificationTime</small>
                             }
                         </p>
-                        <hr/>
+                        <hr />
 
                         @if (GlobalFeatureManager.Instance.IsEnabled<TagsFeature>())
                         {
                             if (Model.TagsFeature?.IsEnabled == true)
                             {
                                 @await Component.InvokeAsync(typeof(TagViewComponent), new
-                                {
-                                    entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType,
-                                    entityId = Model.BlogPost.Id.ToString(),
-                                    urlFormat = $"/blogs/{Model.BlogSlug}?tagId={{TagId}}"
-                                })
+                        {
+                        entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType,
+                        entityId = Model.BlogPost.Id.ToString(),
+                        urlFormat = $"/blogs/{Model.BlogSlug}?tagId={{TagId}}"
+                        })
                             }
                         }
                     </div>
@@ -109,10 +111,10 @@
                             if (Model.ReactionsFeature?.IsEnabled == true)
                             {
                                 @await Component.InvokeAsync(typeof(ReactionSelectionViewComponent), new
-                                {
-                                    entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType,
-                                    entityId = Model.BlogPost.Id.ToString()
-                                })
+                        {
+                        entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType,
+                        entityId = Model.BlogPost.Id.ToString()
+                        })
                             }
                         }
                     </abp-column>
@@ -122,10 +124,10 @@
                             if (Model.RatingsFeature?.IsEnabled == true)
                             {
                                 @await Component.InvokeAsync(typeof(RatingViewComponent), new
-                                {
-                                    entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType,
-                                    entityId = Model.BlogPost.Id.ToString()
-                                })
+                        {
+                        entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType,
+                        entityId = Model.BlogPost.Id.ToString()
+                        })
                             }
                         }
                     </abp-column>
@@ -164,21 +166,4 @@
             entityId = Model.BlogPost.Id.ToString()
         })
     }
-}
-
-@{
-    dynamic ConvertToDynamicObject(Dictionary<string, object> dict)
-    {
-        var eo = new ExpandoObject();
-        var eoColl = (ICollection<KeyValuePair<string, object>>)eo;
-
-        foreach (var kvp in dict)
-        {
-            eoColl.Add(kvp);
-        }
-
-        dynamic eoDynamic = eo;
-
-        return eoDynamic;
-    }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml
index 498569c222..17045c4575 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml
@@ -7,6 +7,8 @@
 @using Volo.Abp.Data
 @using Volo.Abp.AspNetCore.Mvc.UI.Packages.HighlightJs;
 @using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
+@using Volo.CmsKit.Web.Contents;
+
 
 @inject IMarkdownToHtmlRenderer MarkdownRenderer
 
@@ -33,31 +35,15 @@
     <abp-card-body>
         @foreach (ContentFragment contentFragment in Model.PageDto.ContentFragments)
         {
-            if (contentFragment.Type == "Markdown") //TODO: Constant
+            if (contentFragment.Type == ContentConsts.Markdown)
             {
                 @Html.Raw(await MarkdownRenderer.RenderAsync(contentFragment.GetProperty<string>("Content")))
             }
-            else if (contentFragment.Type == "Widget") //TODO: Constant
+            else if (contentFragment.Type == ContentConsts.Widget)
             {
-                @await Component.InvokeAsync(contentFragment.GetProperty<string>("Type"), ConvertToDynamicObject(contentFragment.ExtraProperties))
+                @await Component.InvokeAsync(contentFragment.GetProperty<string>("Type"), contentFragment.ExtraProperties.ConvertToDynamicObject())
             }
         }
     </abp-card-body>
 </abp-card>
 
-@{
-    dynamic ConvertToDynamicObject(Dictionary<string, object> dict)
-    {
-        var eo = new ExpandoObject();
-        var eoColl = (ICollection<KeyValuePair<string, object>>)eo;
-
-        foreach (var kvp in dict)
-        {
-            eoColl.Add(kvp);
-        }
-
-        dynamic eoDynamic = eo;
-
-        return eoDynamic;
-    }
-}
\ No newline at end of file