diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/ICommentAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/ICommentAdminAppService.cs
index 18c5c1a1ba..561d5d137e 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/ICommentAdminAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/ICommentAdminAppService.cs
@@ -15,7 +15,7 @@ public interface ICommentAdminAppService : IApplicationService
 
     Task UpdateApprovalStatusAsync(Guid id, CommentApprovalDto input);
 
-    Task SetSettingsAsync(CommentSettingsDto input);
+    Task UpdateSettingsAsync(CommentSettingsDto input);
 
     Task<CommentSettingsDto> GetSettingsAsync();
 
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Comments/CommentAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Comments/CommentAdminAppService.cs
index 9beee14afd..46b87ffce2 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Comments/CommentAdminAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Comments/CommentAdminAppService.cs
@@ -95,15 +95,15 @@ public class CommentAdminAppService : CmsKitAdminAppServiceBase, ICommentAdminAp
     }
 
     [Authorize(CmsKitAdminPermissions.Comments.SettingManagement)]
-    public async Task SetSettingsAsync(CommentSettingsDto input)
+    public async Task UpdateSettingsAsync(CommentSettingsDto input)
     {
-        await SettingManager.SetGlobalAsync(AppSettings.CommentRequireApprovement, input.CommentRequireApprovement.ToString());
+        await SettingManager.SetGlobalAsync(CmsKitSettings.CommentRequireApprovement, input.CommentRequireApprovement.ToString());
     }
 
     [Authorize(CmsKitAdminPermissions.Comments.SettingManagement)]
     public async Task<CommentSettingsDto> GetSettingsAsync()
     {
-        var isRequireApprovementEnabled = bool.Parse(await SettingManager.GetOrNullGlobalAsync(AppSettings.CommentRequireApprovement));
+	    var isRequireApprovementEnabled = bool.Parse(await SettingManager.GetOrNullGlobalAsync(CmsKitSettings.CommentRequireApprovement));
 
         return new CommentSettingsDto {CommentRequireApprovement = isRequireApprovementEnabled};
     }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/Volo/CmsKit/Admin/Comments/CommentAdminClientProxy.Generated.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/Volo/CmsKit/Admin/Comments/CommentAdminClientProxy.Generated.cs
index 3fe0c523ff..458c88dfa5 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/Volo/CmsKit/Admin/Comments/CommentAdminClientProxy.Generated.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/Volo/CmsKit/Admin/Comments/CommentAdminClientProxy.Generated.cs
@@ -50,9 +50,9 @@ public partial class CommentAdminClientProxy : ClientProxyBase<ICommentAdminAppS
         });
     }
 
-    public virtual async Task SetSettingsAsync(CommentSettingsDto input)
+    public virtual async Task UpdateSettingsAsync(CommentSettingsDto input)
     {
-        await RequestAsync(nameof(SetSettingsAsync), new ClientProxyRequestTypeValue
+        await RequestAsync(nameof(UpdateSettingsAsync), new ClientProxyRequestTypeValue
         {
             { typeof(CommentSettingsDto), input }
         });
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json
index 5b94c6c92f..ef2eef16d8 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json
@@ -1294,7 +1294,7 @@
                   }
                 },
                 {
-                  "name": "SetSettingsAsync",
+                  "name": "UpdateSettingsAsync",
                   "parametersOnMethod": [
                     {
                       "name": "input",
@@ -1606,9 +1606,9 @@
               "allowAnonymous": false,
               "implementFrom": "Volo.CmsKit.Admin.Comments.ICommentAdminAppService"
             },
-            "SetSettingsAsyncByInput": {
-              "uniqueName": "SetSettingsAsyncByInput",
-              "name": "SetSettingsAsync",
+            "UpdateSettingsAsyncByInput": {
+              "uniqueName": "UpdateSettingsAsyncByInput",
+              "name": "UpdateSettingsAsync",
               "httpMethod": "POST",
               "url": "api/cms-kit-admin/comments/settings",
               "supportedVersions": [],
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Comments/CommentAdminController.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Comments/CommentAdminController.cs
index 8a154bd0b6..1d929f1f2b 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Comments/CommentAdminController.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Comments/CommentAdminController.cs
@@ -59,9 +59,9 @@ public class CommentAdminController : CmsKitAdminController, ICommentAdminAppSer
     [HttpPost]
     [Route("settings")]
     [Authorize(CmsKitAdminPermissions.Comments.SettingManagement)]
-    public Task SetSettingsAsync(CommentSettingsDto input)
+    public Task UpdateSettingsAsync(CommentSettingsDto input)
     {
-       return CommentAdminAppService.SetSettingsAsync(input);
+       return CommentAdminAppService.UpdateSettingsAsync(input);
     }
 
     [HttpGet]
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Approve/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Approve/index.js
index 80fc523490..0f2d3cc3b9 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Approve/index.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Approve/index.js
@@ -71,9 +71,6 @@
                                         var message = newApprovalStatus ? l('ApprovedSuccessfully') : l('ApprovalRevokedSuccessfully');
                                         abp.notify.success(message);
                                     })
-                                    .catch(function (error) { // TODO: Is it necessary in ABP Framework?
-                                        abp.notify.error(error.message); 
-                                    });
                             }
                         },
                         {
@@ -90,9 +87,6 @@
                                         var message = newApprovalStatus ? l('ApprovedSuccessfully') : l('ApprovalRevokedSuccessfully');
                                         abp.notify.success(message);
                                     })
-                                    .catch(function (error) { // TODO: Is it necessary in ABP Framework?
-                                        abp.notify.error(error.message);
-                                    });
                             }
                         }
                     ]
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml
index b0906dac21..faefb30c9f 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml
@@ -95,9 +95,9 @@
                                 <abp-input asp-for="@Model.Author" label="@L["Username"].Value" type="text"/>
                             </abp-column>
                             <abp-column size-lg="_2" size-md="_12">
-                                <div class="mb-3" id="isApprovedColumn"> // TODO: Use standard id naming convention. For example: IsApprovedSelectInput
-                                    <label class="mb-1" for="isApprovedSelect">@L["CommentFilter:ApproveState"].Value</label>
-                                    <select id="isApprovedSelect" asp-for="@Model.CommentApproveState" class="form-control">
+                                <div class="mb-3" id="IsApprovedSelectInput">
+                                    <label class="mb-1" for="IsApprovedSelect">@L["CommentFilter:ApproveState"].Value</label>
+                                    <select id="IsApprovedSelect" asp-for="@Model.CommentApproveState" class="form-control">
                                         <option value="@CommentApproveState.All">@L["CommentFilter:All"].Value</option>
                                         <option value="@CommentApproveState.Approved">@L["CommentFilter:Approved"].Value</option>
                                         <option value="@CommentApproveState.Disapproved">@L["CommentFilter:Disapproved"].Value</option>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml
index 9035783666..d08e3cbce2 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml
@@ -32,7 +32,7 @@
     </abp-script-bundle>
 }
 
-<abp-alert id="commentsAlert" alert-type="Warning" style="display: none;"> // TODO: Use standard id naming convention. For example: IsApprovedSelectInput 
+<abp-alert id="CommentsWaitingAlert" alert-type="Warning" style="display: none;">
 </abp-alert>
 
 <abp-card class="mb-4">
@@ -60,9 +60,9 @@
                     </abp-column>
 
                     <abp-column size-lg="_2" size-md="_6">
-                        <div class="mb-3" id="isApprovedColumn">
-                            <label class="mb-1" for="isApprovedSelect">@L["CommentFilter:ApproveState"].Value</label>
-                            <select id="isApprovedSelect" asp-for="@Model.CommentApproveState" class="form-control">
+                        <div class="mb-3" id="IsApprovedSelectInput">
+                            <label class="mb-1" for="IsApprovedSelect">@L["CommentFilter:ApproveState"].Value</label>
+                            <select id="IsApprovedSelect" asp-for="@Model.CommentApproveState" class="form-control">
                                 <option value="@CommentApproveState.All">@L["CommentFilter:All"].Value</option>
                                 <option value="@CommentApproveState.Approved">@L["CommentFilter:Approved"].Value</option>
                                 <option value="@CommentApproveState.Disapproved">@L["CommentFilter:Disapproved"].Value</option>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js
index de7eaa0a3c..27d9f746b3 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js
@@ -93,9 +93,6 @@ $(function (){
                                         var message = newApprovalStatus ? l('ApprovedSuccessfully') : l('ApprovalRevokedSuccessfully');
                                         abp.notify.success(message);
                                     })
-                                    .catch(function (error) { // TODO: Is it necessary in ABP Framework?
-                                        abp.notify.error(error.message);
-                                    });
                             }
                         },
                         {
@@ -114,9 +111,6 @@ $(function (){
                                         var message = newApprovalStatus ? l('ApprovedSuccessfully') : l('ApprovalRevokedSuccessfully');
                                         abp.notify.success(message);
                                     })
-                                    .catch(function (error) { // TODO: Is it necessary in ABP Framework?
-                                        abp.notify.error(error.message);
-                                    });
                             }
                         }
                     ]
@@ -173,12 +167,12 @@ $(function (){
                     var icons = ''
 
                     if (data === null) {
-                        icons = '<i class="fa-solid fa-hourglass-start"></i>';
+                        icons = '<i class="fa-solid fa-hourglass-half text-muted"></i>';
                     } else if (typeof data === "boolean") {
                         if (data) {
-                            icons = '<i class="fa-solid fa-check" style="color: #63E6BE;"></i>';
+                            icons = '<i class="fa-solid fa-check text-success"></i>';
                         } else {
-                            icons = '<i class="fa-solid fa-x" style="color: #e0102f;"></i>';
+                            icons = '<i class="fa-solid fa-x text-danger"></i>';
                         }
                     }
 
@@ -205,7 +199,7 @@ $(function (){
             $('#CommentsTable').DataTable().column(4).visible(true);
         } else {
             $('#CommentsTable').DataTable().column(4).visible(false);
-            $('#isApprovedColumn').hide();
+            $('#IsApprovedSelectInput').hide();
         }
     })
     filterForm.submit(function (e){
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.css b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.css
index ba831f9356..d1dbb49a6f 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.css
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.css
@@ -1,3 +1,3 @@
 .datatableCell{
     cursor: pointer;
-}
+}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js
index 76b37481a8..ced3a043eb 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js
@@ -74,7 +74,7 @@ $(function () {
                                     .delete(data.record.id)
                                     .then(function () {
                                         _dataTable.ajax.reloadEx();
-                                        checkWaitingComments()
+                                        CheckWaitingComments()
                                         abp.notify.success(l('DeletedSuccessfully'));
                                     });
                             }
@@ -90,13 +90,10 @@ $(function () {
                                     .updateApprovalStatus(data.record.id, { IsApproved: newApprovalStatus })
                                     .then(function () {
                                         _dataTable.ajax.reloadEx();
-                                        checkWaitingComments()
+                                        CheckWaitingComments()
                                         var message = newApprovalStatus ? l('ApprovedSuccessfully') : l('ApprovalRevokedSuccessfully');
                                         abp.notify.success(message);
                                     })
-                                    .catch(function (error) { // TODO: Is it necessary in ABP Framework?
-                                        abp.notify.error(error.message);
-                                    });
                             }
                         },
                         {
@@ -112,13 +109,10 @@ $(function () {
                                     .updateApprovalStatus(data.record.id, { IsApproved: newApprovalStatus })
                                     .then(function () {
                                         _dataTable.ajax.reloadEx();
-                                        checkWaitingComments()
+                                        CheckWaitingComments()
                                         var message = newApprovalStatus ? l('ApprovedSuccessfully') : l('ApprovalRevokedSuccessfully');
                                         abp.notify.success(message);
                                     })
-                                    .catch(function (error) { // TODO: Is it necessary in ABP Framework?
-                                        abp.notify.error(error.message);
-                                    });
                             }
                         }
                     ]
@@ -198,12 +192,12 @@ $(function () {
                     var icons = ''
 
                     if (data === null) {
-                        icons = '<i class="fa-solid fa-hourglass-start"></i>';
+                        icons = '<i class="fa-solid fa-hourglass-half text-muted"></i>';
                     } else if (typeof data === "boolean") {
                         if (data) {
-                            icons = '<i class="fa-solid fa-check" style="color: #63E6BE;"></i>';
+                            icons = '<i class="fa-solid fa-check text-success"></i>';
                         } else {
-                            icons = '<i class="fa-solid fa-x" style="color: #e0102f;"></i>';
+                            icons = '<i class="fa-solid fa-x text-danger"></i>';
                         }
                     }
 
@@ -231,28 +225,28 @@ $(function () {
         _dataTable.ajax.reloadEx();
     });
 
-    function checkWaitingComments() { // TODO: Rename this function. CheckWaitingComments is not a good name for this function. 
+    function CheckWaitingComments() { 
         commentsService.getWaitingCount().then(function (count) {
             if (count > 0) {
                 var alertMessage = l("CommentAlertMessage", count);
                 var alertElement = '<abp-alert alert-type="Warning">' + alertMessage + '</abp-alert>';
-                $('#commentsAlert').html(alertElement);
-                $('#commentsAlert').show()
-                $('#commentsAlert').click(function () {
+                $('#CommentsWaitingAlert').html(alertElement);
+                $('#CommentsWaitingAlert').show()
+                $('#CommentsWaitingAlert').click(function () {
                     window.location.href = '/Cms/Comments/Approve'
                 });
             } else {
-                $('#commentsAlert').hide()
+                $('#CommentsWaitingAlert').hide()
             }
         });
     }
-    checkWaitingComments()
+    CheckWaitingComments()
     commentsService.getSettings().then(function (data) {
         if (data.commentRequireApprovement) {
             $('#CommentsTable').DataTable().column(6).visible(true);
         } else {
             $('#CommentsTable').DataTable().column(6).visible(false);
-            $('#isApprovedColumn').hide();
+            $('#IsApprovedSelectInput').hide();
         }
     })
 });
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingPageContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingPageContributor.cs
index fda6999709..ae49d7be69 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingPageContributor.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingPageContributor.cs
@@ -15,7 +15,7 @@ public class CommentSettingPageContributor : ISettingPageContributor
         var l = context.ServiceProvider.GetRequiredService<IStringLocalizer<CmsKitResource>>();
         context.Groups.Add(
             new SettingPageGroup(
-                "Volo.Abp.MySettingGroup",
+                "Cms.Comments",
                 l["Menu:CmsKitCommentOptions"],
                 typeof(CommentSettingViewComponent),
                 order: 1
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingScriptBundleContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingScriptBundleContributor.cs
index aca2ace0b3..9b02222330 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingScriptBundleContributor.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingScriptBundleContributor.cs
@@ -7,7 +7,7 @@ public class CommentSettingScriptBundleContributor : BundleContributor
 {
     public override void ConfigureBundle(BundleConfigurationContext context)
     {
-        context.Files.AddIfNotContains("/client-proxies/cms-kit-admin-proxy.js"); // TODO: is it necessary?
-        context.Files.AddIfNotContains("/Pages/CmsKit/Shared/Components/Comments/index.js");
+        context.Files.AddIfNotContains("/client-proxies/cms-kit-admin-proxy.js");
+        context.Files.AddIfNotContains("/Pages/CmsKit/Shared/Components/Comments/default.js");
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingViewComponent.cs
index 952fb4f10a..5988202919 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingViewComponent.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingViewComponent.cs
@@ -13,6 +13,6 @@ public class CommentSettingViewComponent : AbpViewComponent
 {
     public virtual IViewComponentResult Invoke()
     {
-        return View("~/Pages/CmsKit/Shared/Components/Comments/Index.cshtml");
+        return View("~/Pages/CmsKit/Shared/Components/Comments/default.cshtml");
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/default.cshtml
similarity index 74%
rename from modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/Index.cshtml
rename to modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/default.cshtml
index 7d0240d326..6bbb657205 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/Index.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/default.cshtml
@@ -3,9 +3,7 @@
 
 @section scripts {
     <abp-script-bundle>
-        <abp-script src="/client-proxies/cms-kit-admin-proxy.js" /> // TODO: Remove this line and then check
-        <abp-script src="/client-proxies/cms-kit-common-proxy.js" />  // TODO: Remove this line and then check
-        <abp-script src="/Pages/CmsKit/Shared/Components/Comments/index.js"></abp-script>
+        <abp-script src="/Pages/CmsKit/Shared/Components/Comments/default.js"></abp-script>
     </abp-script-bundle>
 }
 @{
@@ -16,7 +14,7 @@
         <hr />
         <div class="form-group">
             <div class="form-check">
-                <input type="checkbox" id="checkbox" class="form-check-input" name="checkbox"  />
+                <input type="checkbox" id="RequireApprovementCheckbox" class="form-check-input"/>
                 <label for="checkbox" class="form-check-label">@L["CmsKitCommentOptions:RequireApprovement"].Value</label>
             </div>
             <small id="checkboxHelp" class="form-text text-muted">@L["CmsKitCommentOptions:RequireApprovementDescription"].Value</small>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/default.js
similarity index 63%
rename from modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/index.js
rename to modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/default.js
index 0c509a016a..47030b2391 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/index.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/default.js
@@ -9,15 +9,14 @@
             };
             var _getSettings = function () {
                 _service.getSettings().then(function (response) {
-                    // TODO: Rename checkbox id to something more meaningful.
-                    $('#checkbox').prop('checked', response.commentRequireApprovement); // TODO: use $wrapper.find('#checkbox').prop('checked', response.commentRequireApprovement);
+                    $wrapper.find('#RequireApprovementCheckbox').prop('checked', response.commentRequireApprovement);
                 })
             };
 
             var _bindEvents = function () {
                 $('#save').click(function () {
-                    var isChecked = $('#checkbox').prop('checked');
-                    _service.setSettings({ commentRequireApprovement: isChecked }).then(function (response) {
+                    var isChecked = $('#RequireApprovementCheckbox').prop('checked');
+                    _service.updateSettings({ commentRequireApprovement: isChecked }).then(function (response) {
                         abp.notify.success(l("SavedSuccessfully"));
                     })
                 });
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js
index ac9491d6c0..02be61d24b 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js
@@ -205,7 +205,7 @@
       }, ajaxParams));
     };
 
-    volo.cmsKit.admin.comments.commentAdmin.setSettings = function(input, ajaxParams) {
+    volo.cmsKit.admin.comments.commentAdmin.updateSettings = function(input, ajaxParams) {
       return abp.ajax($.extend(true, {
         url: abp.appPath + 'api/cms-kit-admin/comments/settings',
         type: 'POST',
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Settings/AppSettings.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Settings/AppSettings.cs
deleted file mode 100644
index 472d0894e0..0000000000
--- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Settings/AppSettings.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Volo.CmsKit.Settings;
-
-public static class AppSettings
-{
-    public const string CommentRequireApprovement = "Comments.RequireApprovement";
-}
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/Comment.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/Comment.cs
index 943350170e..78e43ac857 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/Comment.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/Comment.cs
@@ -29,7 +29,7 @@ public class Comment : AggregateRoot<Guid>, IHasCreationTime, IMustHaveCreator,
 
     public virtual bool? IsApproved { get; set; }
 
-	protected Comment()
+    protected Comment()
     {
         
     }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettingDefinitionProvider.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettingDefinitionProvider.cs
index cf2c07705b..5655a78452 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettingDefinitionProvider.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettingDefinitionProvider.cs
@@ -7,7 +7,7 @@ public class CmsKitSettingDefinitionProvider : SettingDefinitionProvider
     public override void Define(ISettingDefinitionContext context)
     {
         context.Add(
-            new SettingDefinition(AppSettings.CommentRequireApprovement, "true") // TODO: Check the default value
+            new SettingDefinition(CmsKitSettings.CommentRequireApprovement, "false")
         );
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettings.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettings.cs
index a01696c4c5..1381bb46be 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettings.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettings.cs
@@ -3,6 +3,7 @@
 public static class CmsKitSettings
 {
     public const string GroupName = "CmsKit";
+    public const string CommentRequireApprovement = "Cms.Comments.RequireApprovement";
 
     /* Add constants for setting names. Example:
      * public const string MySettingName = GroupName + ".MySettingName";
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs
index 1c38697e4c..2b6b0d064f 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs
@@ -57,7 +57,7 @@ public class CommentPublicAppService : CmsKitPublicAppServiceBase, ICommentPubli
 
     public virtual async Task<ListResultDto<CommentWithDetailsDto>> GetListAsync(string entityType, string entityId)
     {
-        var isRequireApprovementEnabled = bool.Parse(await SettingManager.GetOrNullGlobalAsync(AppSettings.CommentRequireApprovement));
+        var isRequireApprovementEnabled = bool.Parse(await SettingManager.GetOrNullGlobalAsync(CmsKitSettings.CommentRequireApprovement));
         
         var commentsWithAuthor = isRequireApprovementEnabled
             ? await CommentRepository.GetListWithAuthorsAsync(entityType, entityId, CommentApproveState.Approved)
diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Comments/CommentAdminAppService_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Comments/CommentAdminAppService_Tests.cs
index ac1c83135b..c2c5b57051 100644
--- a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Comments/CommentAdminAppService_Tests.cs
+++ b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Comments/CommentAdminAppService_Tests.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Shouldly;
 using Volo.Abp.Domain.Entities;
+using Volo.Abp.SettingManagement;
 using Volo.CmsKit.Admin.Comments;
 using Xunit;
 
@@ -11,11 +12,12 @@ public class CommentAdminAppService_Tests : CmsKitApplicationTestBase
 {
     private readonly ICommentAdminAppService _commentAdminAppService;
     private readonly CmsKitTestData _cmsKitTestData;
-
+    private readonly ISettingManager _settingManager;
     public CommentAdminAppService_Tests()
     {
         _commentAdminAppService = GetRequiredService<ICommentAdminAppService>();
         _cmsKitTestData = GetRequiredService<CmsKitTestData>();
+        _settingManager = GetRequiredService<ISettingManager>();
     }
 
     [Fact]
diff --git a/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/CmsKitEntityFrameworkCoreTestModule.cs b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/CmsKitEntityFrameworkCoreTestModule.cs
index 139e4bdce9..60a325cda4 100644
--- a/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/CmsKitEntityFrameworkCoreTestModule.cs
+++ b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/CmsKitEntityFrameworkCoreTestModule.cs
@@ -5,13 +5,15 @@ using Microsoft.EntityFrameworkCore.Storage;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.Sqlite;
 using Volo.Abp.Modularity;
+using Volo.Abp.SettingManagement.EntityFrameworkCore;
 
 namespace Volo.CmsKit.EntityFrameworkCore;
 
 [DependsOn(
     typeof(CmsKitTestBaseModule),
     typeof(CmsKitEntityFrameworkCoreModule),
-    typeof(AbpEntityFrameworkCoreSqliteModule)
+    typeof(AbpEntityFrameworkCoreSqliteModule),
+    typeof(AbpSettingManagementEntityFrameworkCoreModule)
     )]
 public class CmsKitEntityFrameworkCoreTestModule : AbpModule
 {
@@ -37,6 +39,10 @@ public class CmsKitEntityFrameworkCoreTestModule : AbpModule
             new DbContextOptionsBuilder<CmsKitDbContext>().UseSqlite(connection).Options
         ).GetService<IRelationalDatabaseCreator>().CreateTables();
 
+        new SettingManagementDbContext(
+            new DbContextOptionsBuilder<SettingManagementDbContext>().UseSqlite(connection).Options
+        ).GetService<IRelationalDatabaseCreator>().CreateTables();
+
         return connection;
     }
 }
diff --git a/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.csproj b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.csproj
index ae28eb3937..feedac2ad0 100644
--- a/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.csproj
+++ b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.csproj
@@ -10,6 +10,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" />
     <ProjectReference Include="..\..\src\Volo.CmsKit.EntityFrameworkCore\Volo.CmsKit.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\Volo.CmsKit.TestBase\Volo.CmsKit.TestBase.csproj" />
+	<ProjectReference Include="..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.EntityFrameworkCore/Volo.Abp.SettingManagement.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.EntityFrameworkCore.Sqlite\Volo.Abp.EntityFrameworkCore.Sqlite.csproj" />
   </ItemGroup>