diff --git a/web-server/src/components/PRTable/PullRequestTableColumnSelector.tsx b/web-server/src/components/PRTable/PullRequestTableColumnSelector.tsx
index a9ab41afc..48828e5f0 100644
--- a/web-server/src/components/PRTable/PullRequestTableColumnSelector.tsx
+++ b/web-server/src/components/PRTable/PullRequestTableColumnSelector.tsx
@@ -13,10 +13,7 @@ import { FlexBox } from '../FlexBox';
 
 const formatColumnName = (
   name: keyof typeof DEFAULT_PR_TABLE_COLUMN_STATE_MAP
-) => {
-  if (name === 'lead_time_as_sum_of_parts') return 'Lead Time';
-  return name.split('_').join(' ');
-};
+) => name.split('_').join(' ');
 
 export const PullRequestTableColumnSelector = () => {
   const theme = useTheme();
diff --git a/web-server/src/components/PRTable/PullRequestsTable.tsx b/web-server/src/components/PRTable/PullRequestsTable.tsx
index 5f3ac9516..27d9e8284 100644
--- a/web-server/src/components/PRTable/PullRequestsTable.tsx
+++ b/web-server/src/components/PRTable/PullRequestsTable.tsx
@@ -37,8 +37,8 @@ import { Line } from '@/components/Text';
 import { SearchInput } from '@/components/TicketsTableAddons/SearchInput';
 import { EasyState, useEasyState } from '@/hooks/useEasyState';
 import { useTableSort } from '@/hooks/useTableSort';
-import { DEFAULT_PR_TABLE_COLUMN_STATE_MAP } from '@/slices/app';
-import { useSelector } from '@/store';
+import { DEFAULT_PR_TABLE_COLUMN_STATE_MAP, appSlice } from '@/slices/app';
+import { useDispatch, useSelector } from '@/store';
 import { brandColors } from '@/theme/schemes/theme';
 import { PR } from '@/types/resources';
 import { getDurationString } from '@/utils/date';
@@ -110,6 +110,8 @@ export const PullRequestsTable: FC<
 
   const enableCsv = true;
 
+  useLeadTimeMigration();
+
   return (
     <FlexBox col gap1>
       {pageCount > 1 && (
@@ -199,71 +201,60 @@ export const PullRequestsTable: FC<
                   <TableCell sx={{ p: CELL_PAD }}>
                     <PrMetaCell pr={pr} />
                   </TableCell>
-                  <TableCell sx={{ p: CELL_PAD }}>
-                    <Box width="100%" display="flex" alignItems="center">
-                      <LightTooltip arrow title={<PrChangesTooltip pr={pr} />}>
+                  {enabledColumnsSet?.has('commits') && (
+                    <TableCell sx={{ p: CELL_PAD }}>
+                      {enabledColumnsSet?.has('commits') && (
                         <Box
                           display="flex"
+                          flex={1}
+                          gap={1}
                           alignItems="center"
-                          bgcolor={theme.colors.secondary.lighter}
-                          borderRadius={1}
-                          overflow="hidden"
-                          maxWidth="220px"
-                          gap={2}
-                          py={1 / 2}
-                          px={1}
+                          color={alpha(theme.colors.secondary.main, 0.8)}
                         >
-                          {enabledColumnsSet?.has('commits') && (
-                            <Box
-                              display="flex"
-                              flex={1}
-                              gap={1}
-                              alignItems="center"
-                              justifyContent="flex-start"
-                              color={alpha(theme.colors.secondary.main, 0.8)}
-                            >
-                              <IoGitCommit />
-                              <Box fontWeight={600}>{pr.commits}</Box>
-                            </Box>
-                          )}
-                          {enabledColumnsSet?.has('lines_changed') && (
-                            <Box
-                              display="flex"
-                              flex={1}
-                              gap={1}
-                              alignItems="center"
-                              justifyContent="center"
-                              color={
-                                pr.additions + pr.deletions
-                                  ? 'warning.main'
-                                  : 'secondary.light'
-                              }
-                            >
-                              <VscRequestChanges />
-                              <Box fontWeight={600}>
-                                {pr.additions + pr.deletions}
-                              </Box>
-                            </Box>
-                          )}
-                          {enabledColumnsSet?.has('comments') && (
-                            <Box
-                              display="flex"
-                              flex={1}
-                              gap={1}
-                              alignItems="center"
-                              justifyContent="flex-end"
-                              color={
-                                pr.comments ? 'info.main' : 'secondary.light'
-                              }
-                            >
-                              <GoCommentDiscussion />
-                              <Box fontWeight={600}>{pr.comments}</Box>
-                            </Box>
-                          )}
+                          <IoGitCommit />
+                          <Box fontWeight={600}>{pr.commits}</Box>
                         </Box>
-                      </LightTooltip>
-                    </Box>
-                  </TableCell>
+                      )}
+                    </TableCell>
+                  )}
+                  {enabledColumnsSet?.has('lines_changed') && (
+                    <TableCell sx={{ p: CELL_PAD }}>
+                      {
+                        <Box
+                          display="flex"
+                          flex={1}
+                          gap={1}
+                          alignItems="center"
+                          color={
+                            pr.additions + pr.deletions
+                              ? 'warning.main'
+                              : 'secondary.light'
+                          }
+                        >
+                          <VscRequestChanges />
+                          <Box fontWeight={600}>
+                            {pr.additions + pr.deletions}
+                          </Box>
+                        </Box>
+                      }
+                    </TableCell>
+                  )}
+                  {enabledColumnsSet?.has('comments') && (
+                    <TableCell sx={{ p: CELL_PAD }}>
+                      {
+                        <Box
+                          display="flex"
+                          flex={1}
+                          gap={1}
+                          alignItems="center"
+                          color={pr.comments ? 'info.main' : 'secondary.light'}
+                        >
+                          <GoCommentDiscussion />
+                          <Box fontWeight={600}>{pr.comments}</Box>
+                        </Box>
+                      }
+                    </TableCell>
+                  )}
                   {enabledColumnsSet.has('base_branch') && (
                     <TableCell sx={{ p: CELL_PAD }}>{pr.base_branch}</TableCell>
                   )}
@@ -384,7 +375,7 @@ export const PullRequestsTable: FC<
                       </Line>
                     </TableCell>
                   )}
-                  {enabledColumnsSet.has('lead_time_as_sum_of_parts') && (
+                  {enabledColumnsSet.has('lead_time') && (
                     <TableCell sx={{ p: CELL_PAD }}>
                       <MiniLeadTimeStat
                         lead={pr.lead_time}
@@ -944,3 +935,16 @@ export const MiniLeadTimeStat: FC<{
     </FlexBox>
   );
 };
+
+const useLeadTimeMigration = () => {
+  const prEnabledConfig = useSelector((s) => s.app.prTableColumnsConfig) as any;
+  const dispatch = useDispatch();
+  useEffect(() => {
+    if (prEnabledConfig?.lead_time_as_sum_of_parts !== undefined) {
+      const updatedColumns = { ...prEnabledConfig };
+      updatedColumns.lead_time = updatedColumns.lead_time_as_sum_of_parts;
+      delete updatedColumns.lead_time_as_sum_of_parts;
+      dispatch(appSlice.actions.setPrTableColumnConfig(updatedColumns));
+    }
+  }, [dispatch, prEnabledConfig]);
+};
diff --git a/web-server/src/components/PRTable/PullRequestsTableHead.tsx b/web-server/src/components/PRTable/PullRequestsTableHead.tsx
index 1fc545ef9..c2fa1cc7b 100644
--- a/web-server/src/components/PRTable/PullRequestsTableHead.tsx
+++ b/web-server/src/components/PRTable/PullRequestsTableHead.tsx
@@ -1,6 +1,5 @@
 import { ScheduleRounded } from '@mui/icons-material';
 import {
-  Box,
   Checkbox,
   TableCell,
   TableHead,
@@ -88,53 +87,44 @@ export const PullRequestsTableHead: FC<PullRequestsTableHeadProps> = ({
         )}
         <TableCell sx={{ minWidth: '40%', p: CELL_PAD, py: 1.5 }}>
           <TableSortLabel
-            direction={conf.field === 'updated_at' ? conf.order : 'asc'}
-            active={conf.field === 'updated_at'}
-            onClick={() => updateSortConf('updated_at')}
+            direction={conf.field === 'repo_name' ? conf.order : 'asc'}
+            active={conf.field === 'repo_name'}
+            onClick={() => updateSortConf('repo_name')}
           >
             Pull Request
           </TableSortLabel>
         </TableCell>
-        <TableCell sx={{ p: CELL_PAD, py: 1.5 }}>
+
+        <TableCell sx={{ minWidth: '40%', p: CELL_PAD, py: 1.5 }}>
           <TableSortLabel
             direction={conf.field === 'commits' ? conf.order : 'asc'}
             active={conf.field === 'commits'}
-            onClick={() => {
-              if (enabledColumnsSet?.has('commits')) {
-                return updateSortConf('commits');
-              }
-              if (enabledColumnsSet?.has('lines_changed')) {
-                return updateSortConf('additions');
-              }
-              if (enabledColumnsSet?.has('comments')) {
-                return updateSortConf('comments');
-              }
-            }}
+            onClick={() => updateSortConf('commits')}
           >
-            <Box
-              display="flex"
-              gap={1}
-              alignItems="center"
-              justifyContent="center"
-            >
-              {enabledColumnsSet?.has('commits') && (
-                <>
-                  <Box color="secondary.main">Commits</Box>
-                  <Box>/</Box>
-                </>
-              )}
-              {enabledColumnsSet?.has('lines_changed') && (
-                <>
-                  <Box color="warning.main">Lines</Box>
-                  <Box>/</Box>
-                </>
-              )}
-              {enabledColumnsSet?.has('comments') && (
-                <Box color="info.main">Comments</Box>
-              )}
-            </Box>
+            Commits
           </TableSortLabel>
         </TableCell>
+
+        <TableCell sx={{ minWidth: '40%', p: CELL_PAD, py: 1.5 }}>
+          <TableSortLabel
+            direction={conf.field === 'additions' ? conf.order : 'asc'}
+            active={conf.field === 'additions'}
+            onClick={() => updateSortConf('additions')}
+          >
+            Lines
+          </TableSortLabel>
+        </TableCell>
+
+        <TableCell sx={{ minWidth: '40%', p: CELL_PAD, py: 1.5 }}>
+          <TableSortLabel
+            direction={conf.field === 'comments' ? conf.order : 'asc'}
+            active={conf.field === 'comments'}
+            onClick={() => updateSortConf('comments')}
+          >
+            Comments
+          </TableSortLabel>
+        </TableCell>
+
         {enabledColumnsSet.has('base_branch') && (
           <TableCell
             align="center"
@@ -266,14 +256,12 @@ export const PullRequestsTableHead: FC<PullRequestsTableHeadProps> = ({
             </TableSortLabel>
           </TableCell>
         )}
-        {enabledColumnsSet.has('lead_time_as_sum_of_parts') && (
+        {enabledColumnsSet.has('lead_time') && (
           <TableCell sx={{ p: CELL_PAD, py: 1.5 }}>
             <TableSortLabel
-              direction={
-                conf.field === 'lead_time_as_sum_of_parts' ? conf.order : 'asc'
-              }
-              active={conf.field === 'lead_time_as_sum_of_parts'}
-              onClick={() => updateSortConf('lead_time_as_sum_of_parts')}
+              direction={conf.field === 'lead_time' ? conf.order : 'asc'}
+              active={conf.field === 'lead_time'}
+              onClick={() => updateSortConf('lead_time')}
             >
               Lead <ClockIcon />
             </TableSortLabel>
diff --git a/web-server/src/components/PRTableMini/PullRequestsTableHeadMini.tsx b/web-server/src/components/PRTableMini/PullRequestsTableHeadMini.tsx
index e4bd90754..b62a60a9a 100644
--- a/web-server/src/components/PRTableMini/PullRequestsTableHeadMini.tsx
+++ b/web-server/src/components/PRTableMini/PullRequestsTableHeadMini.tsx
@@ -80,14 +80,14 @@ export const PullRequestsTableHeadMini: FC<PullRequestsTableHeadProps> = ({
             </TableSortLabel>
           </TableCell>
         )}
-        {!hideColumns?.has('cycle_time') && (
+        {!hideColumns?.has('lead_time') && (
           <TableCell sx={{ p: CELL_PAD, py: 1.5 }}>
             <TableSortLabel
-              direction={conf.field === 'cycle_time' ? conf.order : 'asc'}
-              active={conf.field === 'cycle_time'}
-              onClick={() => updateSortConf('cycle_time')}
+              direction={conf.field === 'lead_time' ? conf.order : 'asc'}
+              active={conf.field === 'lead_time'}
+              onClick={() => updateSortConf('lead_time')}
             >
-              Cycle
+              Lead
             </TableSortLabel>
           </TableCell>
         )}
diff --git a/web-server/src/content/DoraMetrics/DoraCards/SkeletalCard.tsx b/web-server/src/content/DoraMetrics/DoraCards/SkeletalCard.tsx
index 205a7ec85..585a4feec 100644
--- a/web-server/src/content/DoraMetrics/DoraCards/SkeletalCard.tsx
+++ b/web-server/src/content/DoraMetrics/DoraCards/SkeletalCard.tsx
@@ -26,7 +26,7 @@ export const DataStillSyncing = () => {
   }, [flickerAnimation.toggle]);
   return (
     <FlexBox col gap2>
-      <ScoreSkeleton />
+      <ScoreSkeleton animation={flickerAnimation.value} />
       <LoaderCore />
       <Divider />
       <Grid container spacing={4}>
@@ -118,6 +118,7 @@ const ScoreSkeleton: FC<{ animation?: boolean }> = ({ animation }) => {
           ml={1}
           sx={{
             filter: `brightness(${animation ? 0.7 : 1})`,
+            opacity: animation ? 0.7 : 1,
             transition: `all ${ANIMATON_DURATION}ms linear`
           }}
         >
diff --git a/web-server/src/content/DoraMetrics/Incidents.tsx b/web-server/src/content/DoraMetrics/Incidents.tsx
index 2b9fe88f5..cf3bf497e 100644
--- a/web-server/src/content/DoraMetrics/Incidents.tsx
+++ b/web-server/src/content/DoraMetrics/Incidents.tsx
@@ -184,33 +184,41 @@ export const AllIncidentsBody = () => {
           </Line>{' '}
           from {dateRangeLabel} across all data sources,{' '}
           {filteredDeployments.length}{' '}
-          {pluralize('deployment', filteredDeployments.length)} may have led to
-          possible incidents.
+          {pluralize('deployment', filteredDeployments.length)}{' '}
+          {filteredDeployments.length ? 'may' : ''} have led to possible
+          incidents.
         </Line>
       </FlexBox>
-      <Divider />
-      <FlexBox gap1 flex1 fullWidth component={Paper} minHeight="75vh">
-        <FlexBox col>
-          <FlexBox flexGrow={1}>
-            <Scrollbar autoHeight autoHeightMin="100%">
-              <FlexBox col gap1 p={1} flexGrow={1}>
-                {filteredDeployments?.map((deployment) => {
-                  return (
-                    <DeploymentWithIncidentsMenuItem
-                      deployment={deployment}
-                      key={deployment.id}
-                      onSelect={setSelectedDeploymentId}
-                      selected={selectedDeploymentId.value === deployment.id}
-                    />
-                  );
-                })}
+
+      {!!filteredDeployments.length && (
+        <>
+          <Divider />
+          <FlexBox gap1 flex1 fullWidth component={Paper} minHeight="75vh">
+            <FlexBox col>
+              <FlexBox flexGrow={1}>
+                <Scrollbar autoHeight autoHeightMin="100%">
+                  <FlexBox col gap1 p={1} flexGrow={1}>
+                    {filteredDeployments?.map((deployment) => {
+                      return (
+                        <DeploymentWithIncidentsMenuItem
+                          deployment={deployment}
+                          key={deployment.id}
+                          onSelect={setSelectedDeploymentId}
+                          selected={
+                            selectedDeploymentId.value === deployment.id
+                          }
+                        />
+                      );
+                    })}
+                  </FlexBox>
+                </Scrollbar>
               </FlexBox>
-            </Scrollbar>
+            </FlexBox>
+            <Divider orientation="vertical" />
+            <SelectedIncidentDetails deploymentDetails={selectedDeployment} />
           </FlexBox>
-        </FlexBox>
-        <Divider orientation="vertical" />
-        <SelectedIncidentDetails deploymentDetails={selectedDeployment} />
-      </FlexBox>
+        </>
+      )}
     </FlexBox>
   );
 };
diff --git a/web-server/src/hooks/useTableSort.ts b/web-server/src/hooks/useTableSort.ts
index 2b513b999..2f756df52 100644
--- a/web-server/src/hooks/useTableSort.ts
+++ b/web-server/src/hooks/useTableSort.ts
@@ -1,6 +1,5 @@
-import { ascend, descend, partition, propOr, sort } from 'ramda';
+import { ascend, descend, head, partition, propOr, sort } from 'ramda';
 import { useCallback, useMemo } from 'react';
-import { snakeCase } from 'voca';
 
 import { track } from '@/constants/events';
 import { useEasyState } from '@/hooks/useEasyState';
@@ -29,9 +28,30 @@ export const useTableSort = <T = Record<string, any>>(
     [conf.field, conf.order, sortConfig.set]
   );
 
-  const sortedList: T[] = useMemo(
-    () =>
-      sort(
+  const handleAuthorUsernameSort = useCallback(
+    (rawList: any[]) => {
+      if (!head(rawList || [])?.author?.username) return rawList;
+
+      const result = [...rawList];
+      if (conf.order === 'asc') {
+        result.sort((a, b) => {
+          return a.author.username.localeCompare(b.author.username);
+        });
+      } else {
+        result.sort((b, a) => {
+          return a.author.username.localeCompare(b.author.username);
+        });
+      }
+      return result;
+    },
+    [conf.order]
+  );
+
+  const sortedList: T[] = useMemo(() => {
+    if (conf.field === 'author') {
+      return handleAuthorUsernameSort(list);
+    } else
+      return sort(
         // @ts-ignore
         conf.order === 'asc'
           ? // @ts-ignore
@@ -39,9 +59,8 @@ export const useTableSort = <T = Record<string, any>>(
           : // @ts-ignore
             descend(propOr('', conf.field)),
         list
-      ),
-    [conf.field, conf.order, list]
-  );
+      );
+  }, [conf.field, conf.order, handleAuthorUsernameSort, list]);
 
   const getCSV = useCallback(() => {
     createCsvFromList(list);
@@ -84,10 +103,6 @@ const EXCLUDED_HEADERS = new Set([
   'priority_order'
 ]);
 
-const headerNameOverrides: Record<string, string> = {
-  lead_time_as_sum_of_parts: 'lead_time_for_changes'
-};
-
 const getNestedValueFromCell = (cell: any) => {
   if (Array.isArray(cell) && getNestedValueFromCellItem(cell[0])) {
     const values = cell.map(getNestedValueFromCellItem).filter(Boolean);
@@ -110,10 +125,6 @@ const checkIfColumnShouldBeRemoved = (name: string, cell: any) => {
   return false;
 };
 
-const renameColumns = (headers: string[]) => {
-  return headers.map((name) => snakeCase(headerNameOverrides[name] || name));
-};
-
 const createCsvFromList = (list: Record<string, any>[]) => {
   if (!list.length) return;
 
@@ -144,7 +155,7 @@ const createCsvFromList = (list: Record<string, any>[]) => {
       .join(',')
   );
 
-  const headers = renameColumns([...includedSet.keys()]);
+  const headers = [...includedSet.keys()];
 
   downloadCSVFromString(
     [headers.join(','), ...rows].join('\n'),
diff --git a/web-server/src/slices/app.ts b/web-server/src/slices/app.ts
index 392041aec..4bbd5b943 100644
--- a/web-server/src/slices/app.ts
+++ b/web-server/src/slices/app.ts
@@ -61,7 +61,7 @@ export const DEFAULT_PR_TABLE_COLUMN_STATE_MAP = {
   rework_time: false,
   merge_time: false,
   merge_to_deploy: false,
-  lead_time_as_sum_of_parts: true,
+  lead_time: true,
   created_at: false,
   updated_at: false,
   head_branch: false,
diff --git a/web-server/src/types/resources.ts b/web-server/src/types/resources.ts
index 2a737b440..556de426e 100644
--- a/web-server/src/types/resources.ts
+++ b/web-server/src/types/resources.ts
@@ -125,6 +125,7 @@ export interface BasePR {
 
 export interface PR extends BasePR {
   lead_time_as_sum_of_parts?: number;
+  lead_time?: number;
   original_reverted_pr?: BasePR;
 }