diff --git a/api/src/utils/content-type-creator.utils.ts b/api/src/utils/content-type-creator.utils.ts
index 2233faf68..d3a462312 100644
--- a/api/src/utils/content-type-creator.utils.ts
+++ b/api/src/utils/content-type-creator.utils.ts
@@ -685,9 +685,9 @@ const mergeFields = async (schema1: any[], schema2: any[]): Promise<any[]> => {
 
   for (const field2 of schema2) {
     if (field2?.data_type === 'group') {
-      const machingGroup = findGroupByUid(schema1, field2?.uid);
-      if(machingGroup){
-       const schema = await mergeArrays(machingGroup?.schema ?? [],field2?.schema ?? [] );
+      const matchingGroup = findGroupByUid(schema1, field2?.uid);
+      if(matchingGroup){
+       const schema =  mergeArrays(matchingGroup?.schema ?? [],field2?.schema ?? [] );
         result?.push({
           ...field2,
           schema: schema
diff --git a/ui/src/components/AdvancePropertise/advanceProperties.interface.ts b/ui/src/components/AdvancePropertise/advanceProperties.interface.ts
index f018cea6e..09920202f 100644
--- a/ui/src/components/AdvancePropertise/advanceProperties.interface.ts
+++ b/ui/src/components/AdvancePropertise/advanceProperties.interface.ts
@@ -24,6 +24,7 @@ export interface SchemaProps {
    * @param rowId - The ID of the row.
    * @param value - The advanced settings.
    * @param checkBoxChanged - Indicates whether the checkbox has changed.
+   * @param rowContentstackFieldUid - Uid to get correct row from tableData
    */
   updateFieldSettings: (rowId: string, value: Advanced, checkBoxChanged: boolean, rowContentstackFieldUid: string) => void;
 
diff --git a/ui/src/components/AuditFilterModal/index.tsx b/ui/src/components/AuditFilterModal/index.tsx
index bb5b67f74..4500ab50d 100644
--- a/ui/src/components/AuditFilterModal/index.tsx
+++ b/ui/src/components/AuditFilterModal/index.tsx
@@ -77,8 +77,10 @@ const AuditFilterModal = ({
 
             <div className="tableFilterModalStories__list">
                 {filterOptions?.length > 0 ? (
-                    filterOptions.map((item, index) => (
-                        <div key={''} >
+                    filterOptions.map((item) => {
+                        const uid = item?.value
+                        return (
+                        <div key={uid} >
                             <div className="tableFilterModalStories__suggestion-item">
                                 <Checkbox
                                     checked={selectedLevels?.some((v) => v?.value === item?.value)}
@@ -91,7 +93,7 @@ const AuditFilterModal = ({
                                 />
                             </div>
                         </div>
-                    ))
+                    )})
                 ) : (
                     <div className="tableFilterModalStories__no-data">
                         {auditLogsConstants?.filterModal?.noFilterAvailabe}
diff --git a/ui/src/components/Common/Settings/Settings.scss b/ui/src/components/Common/Settings/Settings.scss
index a592df415..439c434b8 100644
--- a/ui/src/components/Common/Settings/Settings.scss
+++ b/ui/src/components/Common/Settings/Settings.scss
@@ -16,7 +16,7 @@
 
   .PageLayout__head,
   .PageLayout__leftSidebar {
-    border-top: 1;
+    border-top: 1px solid $color-base-gray-40;
   }
 
   .PageLayout--primary {
diff --git a/ui/src/components/LogScreen/MigrationLogViewer.tsx b/ui/src/components/LogScreen/MigrationLogViewer.tsx
index cb59399df..2b8ab6509 100644
--- a/ui/src/components/LogScreen/MigrationLogViewer.tsx
+++ b/ui/src/components/LogScreen/MigrationLogViewer.tsx
@@ -283,9 +283,8 @@ const MigrationLogViewer = ({ serverPath }: LogsType) => {
                     ) : (
                       <div
                         style={logStyles[level || ''] || logStyles.info}
-                        className="log-entry logs-bg"
+                        className="log-entry"
                       >
-                        <div className="log-number">{index}</div>
                         <div className="log-time">
                           {timestamp
                             ? new Date(timestamp)?.toTimeString()?.split(' ')[0]
diff --git a/ui/src/components/LogScreen/index.scss b/ui/src/components/LogScreen/index.scss
index 21aa278d9..ff7145efa 100644
--- a/ui/src/components/LogScreen/index.scss
+++ b/ui/src/components/LogScreen/index.scss
@@ -45,7 +45,7 @@
   font-family: 'IBM Plex Mono', monospace;
   font-size: $size-font-large;
   font-weight: $font-weight-medium;
-  padding: 30px 20px;
+  padding: 5px 0;
   position: relative;
 
   &.logs-bg {
diff --git a/ui/src/components/LogScreen/index.tsx b/ui/src/components/LogScreen/index.tsx
index 62532e890..c6d885cc7 100644
--- a/ui/src/components/LogScreen/index.tsx
+++ b/ui/src/components/LogScreen/index.tsx
@@ -277,9 +277,8 @@ const TestMigrationLogViewer = ({ serverPath, sendDataToParent, projectId }: Log
                     ) : (
                       <div
                         style={logStyles[level || ''] || logStyles.info}
-                        className="log-entry logs-bg"
+                        className="log-entry"
                       >
-                        <div className="log-number">{index}</div>
                         <div className="log-time">
                           {timestamp
                             ? new Date(timestamp)?.toTimeString()?.split(' ')[0]