diff --git a/adminforth/spa/src/components/ResourceListTable.vue b/adminforth/spa/src/components/ResourceListTable.vue
index e35f1cf47..02cd239d9 100644
--- a/adminforth/spa/src/components/ResourceListTable.vue
+++ b/adminforth/spa/src/components/ResourceListTable.vue
@@ -18,15 +18,16 @@
         <!-- table header -->
         <tr class="t-header sticky z-10 top-0 text-xs  bg-lightListTableHeading dark:bg-darkListTableHeading dark:text-gray-400">
           <td scope="col" class="p-4">
-            <div v-if="rows && rows.length" class="flex items-center">
+            <div class="flex items-center">
               <input id="checkbox-all-search" type="checkbox" :checked="allFromThisPageChecked" @change="selectAll()" 
+                    :disabled="!rows || !rows.length"
                     class="w-4 h-4 cursor-pointer text-blue-600 bg-gray-100 border-gray-300 rounded
                     focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 dark:focus:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
               <label for="checkbox-all-search" class="sr-only">{{ $t('checkbox') }}</label>
             </div>
           </td>
 
-          <td v-for="c in columnsListed" scope="col" class="px-2 md:px-3 lg:px-6 py-3">
+          <td v-for="c in columnsListed" ref="headerRefs" scope="col" class="px-2 md:px-3 lg:px-6 py-3">
           
             <div @click="(evt) => c.sortable && onSortButtonClick(evt, c.name)" 
                 class="flex items-center " :class="{'cursor-pointer':c.sortable}">
@@ -65,6 +66,7 @@
           :columns="resource?.columns.filter(c => c.showIn.list).length + 2"
           :rows="rowHeights.length || 3"
           :row-heights="rowHeights"
+          :column-widths="columnWidths"
         />
         <tr v-else-if="rows.length === 0" class="bg-lightListTable dark:bg-darkListTable dark:border-darkListTableBorder">
           <td :colspan="resource?.columns.length + 2">
@@ -376,10 +378,13 @@ watch(() => props.page, (newPage) => {
 });
 
 const rowRefs = useTemplateRef('rowRefs');
+const headerRefs = useTemplateRef('headerRefs');
 const rowHeights = ref([]);
+const columnWidths = ref([]);
 watch(() => props.rows, (newRows) => {
   // rows are set to null when new records are loading
   rowHeights.value = newRows || !rowRefs.value ? [] : rowRefs.value.map((el) => el.offsetHeight);
+  columnWidths.value = newRows || !headerRefs.value ? [] : [48, ...headerRefs.value.map((el) => el.offsetWidth)];
 });
 
 function addToCheckedValues(id) {
diff --git a/adminforth/spa/src/components/SkeleteLoader.vue b/adminforth/spa/src/components/SkeleteLoader.vue
index d723d4b6f..308cb6c37 100644
--- a/adminforth/spa/src/components/SkeleteLoader.vue
+++ b/adminforth/spa/src/components/SkeleteLoader.vue
@@ -1,10 +1,16 @@
 <template>
     <tr
         v-for="(r, ri) in new Array(props.rows)"
-        class="bg-lightListTable border-b dark:bg-darkListTable dark:border-darkListBorder"
-        :style="[props.rowHeights[ri] !== undefined ? `height: ${props.rowHeights[ri]}px` : '' ]"
+        class="bg-lightListTable dark:bg-darkListTable dark:border-darkListBorder"
+        :class="{'border-b': ri !== props.rows - 1}"
+        :style="[`height: ${props.rowHeights[ri] !== undefined ? props.rowHeights[ri] : 52.5}px`]"
     >
-        <td v-for="c in new Array(props.columns)" class="items-center px-6 py-8 cursor-default" >
+        <td
+            v-for="(c, ci) in new Array(props.columns)" class="items-center px-6 py-4 cursor-default"
+            :style="[props.columnWidths[ci] !== undefined
+                ? `min-width: ${props.columnWidths[ci]}px; width: ${props.columnWidths[ci]}px;`
+                : '']"
+        >
             <div role="status" class="max-w-sm animate-pulse">
                 <div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[360px]"></div>
             </div>
@@ -18,8 +24,10 @@ const props = withDefaults(defineProps<{
     columns: number;
     rows: number;
     rowHeights?: number[];
+    columnWidths?: number[];
 }>(), {
     rowHeights: [],
+    columnWidths: [],
 });
 
 </script>