diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs
index af2398a030..f8ae091733 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs
@@ -21,7 +21,12 @@ namespace Volo.CmsKit.Admin.Web
         {
             context.Services.PreConfigure<AbpMvcDataAnnotationsLocalizationOptions>(options =>
             {
-                options.AddAssemblyResource(typeof(CmsKitResource), typeof(CmsKitAdminWebModule).Assembly);
+                options.AddAssemblyResource(
+                    typeof(CmsKitResource),
+                    typeof(CmsKitAdminWebModule).Assembly,
+                    typeof(CmsKitAdminApplicationContractsModule).Assembly,
+                    typeof(CmsKitCommonApplicationContractsModule).Assembly
+                );
             });
 
             PreConfigure<IMvcBuilder>(mvcBuilder =>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebAutoMapperProfile.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebAutoMapperProfile.cs
index da60048298..d168c4fc75 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebAutoMapperProfile.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebAutoMapperProfile.cs
@@ -6,9 +6,7 @@ namespace Volo.CmsKit.Public.Web
     {
         public CmsKitPublicWebAutoMapperProfile()
         {
-            /* You can configure your AutoMapper mapping configuration here.
-             * Alternatively, you can split your mapping configurations
-             * into multiple profile classes for a better organization. */
+
         }
     }
 }
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 2b4a2e8fce..862213ab7a 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs
@@ -21,7 +21,12 @@ namespace Volo.CmsKit.Public.Web
         {
             context.Services.PreConfigure<AbpMvcDataAnnotationsLocalizationOptions>(options =>
             {
-                options.AddAssemblyResource(typeof(CmsKitResource), typeof(CmsKitPublicWebModule).Assembly);
+                options.AddAssemblyResource(
+                    typeof(CmsKitResource),
+                    typeof(CmsKitPublicWebModule).Assembly,
+                    typeof(CmsKitPublicApplicationContractsModule).Assembly,
+                    typeof(CmsKitCommonApplicationContractsModule).Assembly
+                );
             });
 
             PreConfigure<IMvcBuilder>(mvcBuilder =>
@@ -43,6 +48,7 @@ namespace Volo.CmsKit.Public.Web
             });
 
             context.Services.AddAutoMapperObjectMapper<CmsKitPublicWebModule>();
+
             Configure<AbpAutoMapperOptions>(options =>
             {
                 options.AddMaps<CmsKitPublicWebModule>(validate: true);
@@ -50,7 +56,7 @@ namespace Volo.CmsKit.Public.Web
 
             Configure<RazorPagesOptions>(options =>
             {
-                //Configure authorization.
+                //...
             });
         }
     }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicWidgetsController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicWidgetsController.cs
index 29d6e27d1f..c130ebefca 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicWidgetsController.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicWidgetsController.cs
@@ -5,17 +5,16 @@ using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.ReactionSelection;
 
 namespace Volo.CmsKit.Public.Web.Controllers
 {
-    //TODO: Consider to move to an area, but also consider to not have the same prefix with API Controllers which can be problem in case of a tiered architecture
     public class CmsKitPublicWidgetsController : CmsKitPublicControllerBase
     {
-        public async Task<IActionResult> ReactionSelection(string entityType, string entityId)
+        public Task<IActionResult> ReactionSelection(string entityType, string entityId)
         {
-            return ViewComponent(typeof(ReactionSelectionViewComponent), new {entityType, entityId});
+            return Task.FromResult((IActionResult)ViewComponent(typeof(ReactionSelectionViewComponent), new {entityType, entityId}));
         }
 
-        public async Task<IActionResult> Commenting(string entityType, string entityId)
+        public Task<IActionResult> Commenting(string entityType, string entityId)
         {
-            return ViewComponent(typeof(CommentingViewComponent), new {entityType, entityId});
+            return Task.FromResult((IActionResult)ViewComponent(typeof(CommentingViewComponent), new {entityType, entityId}));
         }
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Menus/CmsKitPublicMenus.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Menus/CmsKitPublicMenus.cs
index 5b8e026122..eee362a20b 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Menus/CmsKitPublicMenus.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Menus/CmsKitPublicMenus.cs
@@ -6,6 +6,5 @@
 
         //Add your menu items here...
         //public const string Home = Prefix + ".MyNewMenuItem";
-
     }
-}
\ No newline at end of file
+}
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/PublicPageModel.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/PublicPageModel.cs
index 0ea29457e9..bbc6de3dfe 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/PublicPageModel.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/PublicPageModel.cs
@@ -3,14 +3,12 @@ using Volo.CmsKit.Localization;
 
 namespace Volo.CmsKit.Public.Web.Pages
 {
-    /* Inherit your PageModel classes from this class.
-     */
-    public abstract class PublicPageModel : AbpPageModel
+    public abstract class CmsKitPublicPageModelBase : AbpPageModel
     {
-        protected PublicPageModel()
+        protected CmsKitPublicPageModelBase()
         {
             LocalizationResourceType = typeof(CmsKitResource);
             ObjectMapperContext = typeof(CmsKitPublicWebModule);
         }
     }
-}
\ No newline at end of file
+}