diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/IPageAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/IPageAppService.cs
index d8ea8f1751..7363d32a3c 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/IPageAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/IPageAppService.cs
@@ -5,6 +5,6 @@ namespace Volo.CmsKit.Public.Pages
 {
     public interface IPageAppService
     {
-        Task<PageDto> GetByUrlAsync([NotNull] string url);
+        Task<PageDto> FindByUrlAsync([NotNull] string url);
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PageAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PageAppService.cs
index 38f4406cab..1e1d63bf71 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PageAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PageAppService.cs
@@ -12,9 +12,14 @@ namespace Volo.CmsKit.Public.Pages
             PageRepository = pageRepository;
         }
 
-        public virtual async Task<PageDto> GetByUrlAsync(string url)
+        public virtual async Task<PageDto> FindByUrlAsync(string url)
         {
-            var page = await PageRepository.GetByUrlAsync(url);
+            var page = await PageRepository.FindByUrlAsync(url);
+
+            if (page == null)
+            {
+                return null;
+            }
             
             return ObjectMapper.Map<Page, PageDto>(page);
         }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs
index 45dda25ab5..a9c6cd70e4 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs
@@ -7,7 +7,7 @@ namespace Volo.CmsKit.Public.Pages
     [RemoteService(Name = CmsKitPublicRemoteServiceConsts.RemoteServiceName)]
     [Area("cms-kit")]
     [Route("api/cms-kit-public/comments")]
-    public class PagesPublicController
+    public class PagesPublicController : IPageAppService
     {
         protected readonly IPageAppService PageAppService;
 
@@ -18,9 +18,9 @@ namespace Volo.CmsKit.Public.Pages
 
         [HttpGet]
         [Route("url/{url}")]
-        public Task<PageDto> GetByUrlAsync(string url)
+        public Task<PageDto> FindByUrlAsync(string url)
         {
-            return PageAppService.GetByUrlAsync(url);
+            return PageAppService.FindByUrlAsync(url);
         }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs
index 0149722671..d44f67afc5 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc.RazorPages;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AutoMapper;
@@ -56,7 +57,7 @@ namespace Volo.CmsKit.Public.Web
 
             Configure<RazorPagesOptions>(options =>
             {
-                //...
+                options.Conventions.AddPageRoute("/CmsKit/Pages/Index", "/{*pageUrl}");
             });
         }
     }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml
index c31edaaba8..73c7637b01 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml
@@ -1,4 +1,4 @@
-@page "{pageUrl}"
+@page "{*pageUrl}"
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.CmsKit.Localization
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Pages
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml.cs
index 1d5dca0940..5443608845 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml.cs
@@ -19,9 +19,16 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Pages
             PageAppService = pageAppService;
         }
 
-        public async Task OnGetAsync()
+        public async Task<IActionResult> OnGetAsync()
         {
-            Page = await PageAppService.GetByUrlAsync(PageUrl);
+            Page = await PageAppService.FindByUrlAsync(PageUrl);
+
+            if (Page == null)
+            {
+                return NotFound();
+            }
+
+            return Page();
         }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Contents/ContentViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Contents/ContentViewComponent.cs
index 129bff61cf..6a2a4e5a13 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Contents/ContentViewComponent.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Contents/ContentViewComponent.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.Domain.Entities;
 using Volo.CmsKit.Public.Contents;
 using Volo.CmsKit.Web.Contents;
 
@@ -25,18 +26,26 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Contents
             string entityType,
             string entityId)
         {
-            var content = await contentAppService.GetAsync(new GetContentInput
+            var content = string.Empty;
+            
+            try
             {
-                EntityId = entityId,
-                EntityType = entityType
-            });
+                var contentDto = await contentAppService.GetAsync(new GetContentInput
+                {
+                    EntityId = entityId,
+                    EntityType = entityType
+                });
+
+                content = contentDto.Value;
+            }
+            catch (EntityNotFoundException e)
+            {
+                // ContentDto can be null, we will render empty content.
+            }
 
             var viewModel = new ContentViewModel
             {
-                EntityId = entityId,
-                EntityType = entityType,
-                ContentId = content.Id,
-                Rendered = await contentRenderer.RenderAsync(content.Value)
+                Value = await contentRenderer.RenderAsync(content)
             };
 
             return View("~/Pages/CmsKit/Shared/Components/Contents/Default.cshtml", viewModel);
@@ -44,12 +53,7 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Contents
 
         public class ContentViewModel
         {
-            public Guid ContentId { get; set; }
-            public string EntityType { get; set; }
-
-            public string EntityId { get; set; }
-
-            public string Rendered { get; set; }
+            public string Value { get; set; }
         }
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Contents/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Contents/Default.cshtml
index 29f7bfa6a3..0f1ddedfe5 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Contents/Default.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Contents/Default.cshtml
@@ -1,3 +1,3 @@
 @model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Contents.ContentViewComponent.ContentViewModel
 
-@Html.Raw(Model.Rendered)
+@Html.Raw(Model.Value)
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Pages/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Pages/Default.cshtml
index 28af196e39..e10fa0754a 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Pages/Default.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Pages/Default.cshtml
@@ -1,16 +1,16 @@
 @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
 
 @using Microsoft.AspNetCore.Mvc.RazorPages
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Contents
 @model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Pages.PageViewModel
+@inject IPageLayout PageLayout
+
+@{
+    PageLayout.Content.Title = Model.Title;
+}
 
 <abp-card>
-    <abp-card-header>
-        <h3>
-            @Model.Title
-        </h3>
-    </abp-card-header>
-    
     <abp-card-body>
         @await Component.InvokeAsync(typeof(ContentViewComponent), 
             new
diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PagePublicAppService_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PagePublicAppService_Tests.cs
index 290f02caff..c0943a1279 100644
--- a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PagePublicAppService_Tests.cs
+++ b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PagePublicAppService_Tests.cs
@@ -18,15 +18,20 @@ namespace Volo.CmsKit.Pages
         }
 
         [Fact]
-        public async Task ShouldGetByUrlAsync()
+        public async Task ShouldFindByUrlAsync()
         {
-            await Should.NotThrowAsync(async () => await _pageAppService.GetByUrlAsync(_data.Page_1_Url));
+            var page = await _pageAppService.FindByUrlAsync(_data.Page_1_Url);
+
+            page.ShouldNotBeNull();
+            page.Title.ShouldBe(_data.Page_1_Title);
         }
         
         [Fact]
         public async Task ShouldNotGetByUrlAsync()
         {
-            await Should.ThrowAsync<Exception>(async () => await _pageAppService.GetByUrlAsync("not-exist-url"));
+            var page = await _pageAppService.FindByUrlAsync("not-exist-url");
+            
+            page.ShouldBeNull();
         }
     }
 }
\ No newline at end of file