diff --git a/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png b/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png
index 2646cc85e09..38e8e4570aa 100644
Binary files a/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-checks-that-settings-page-can-be-opened-2-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-checks-that-settings-page-can-be-opened-2-chromium-linux.png
index e50ea3fe2f2..22186d83389 100644
Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-checks-that-settings-page-can-be-opened-2-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-checks-that-settings-page-can-be-opened-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-1-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-1-chromium-linux.png
index 8b6f637184d..6abd4082738 100644
Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-1-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-1-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-1-chromium-linux.png
index 0cfdffe0d74..e2981f282c6 100644
Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-1-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-2-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-2-chromium-linux.png
index 08644ff8375..65935ac1424 100644
Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-2-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-loads-the-budget-page-with-budgeted-amounts-1-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-loads-the-budget-page-with-budgeted-amounts-1-chromium-linux.png
index a29cc002d92..90efef73ea0 100644
Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-loads-the-budget-page-with-budgeted-amounts-1-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-loads-the-budget-page-with-budgeted-amounts-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png
index b25a320d879..514fef5fcd2 100644
Binary files a/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/package.json b/packages/desktop-client/package.json
index 5bd8879c351..921766ab9e2 100644
--- a/packages/desktop-client/package.json
+++ b/packages/desktop-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@actual-app/web",
-  "version": "23.10.0",
+  "version": "23.11.0",
   "license": "MIT",
   "files": [
     "build"
diff --git a/packages/desktop-client/src/components/Titlebar.tsx b/packages/desktop-client/src/components/Titlebar.tsx
index bab3123ba3f..587b3c2f2a0 100644
--- a/packages/desktop-client/src/components/Titlebar.tsx
+++ b/packages/desktop-client/src/components/Titlebar.tsx
@@ -41,15 +41,21 @@ import useSheetValue from './spreadsheet/useSheetValue';
 import { ThemeSelector } from './ThemeSelector';
 import { Tooltip } from './tooltips';
 
-export let TitlebarContext = createContext(null);
+export type TitlebarContextValue = {
+  sendEvent: (msg: string) => void;
+  subscribe: (listener) => () => void;
+};
+
+export let TitlebarContext = createContext<TitlebarContextValue>(null);
 
 type TitlebarProviderProps = {
   children?: ReactNode;
 };
+
 export function TitlebarProvider({ children }: TitlebarProviderProps) {
   let listeners = useRef([]);
 
-  function sendEvent(msg) {
+  function sendEvent(msg: string) {
     listeners.current.forEach(func => func(msg));
   }
 
diff --git a/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
index bf7164aff9d..05641edfa81 100644
--- a/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
+++ b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
@@ -7,6 +7,11 @@ import React, {
 
 import { css } from 'glamor';
 
+import {
+  type CategoryEntity,
+  type CategoryGroupEntity,
+} from 'loot-core/src/types/models';
+
 import Split from '../../icons/v0/Split';
 import { theme } from '../../style';
 import Text from '../common/Text';
@@ -14,21 +19,8 @@ import View from '../common/View';
 
 import Autocomplete, { defaultFilterSuggestion } from './Autocomplete';
 
-export type Category = {
-  id: string;
-  cat_group: unknown;
-  groupName: string;
-  name: string;
-};
-
-export type CategoryGroup = {
-  id: string;
-  name: string;
-  categories: Array<Category>;
-};
-
 export type CategoryListProps = {
-  items: Array<Category>;
+  items: Array<CategoryEntity & { group?: CategoryGroupEntity }>;
   getItemProps?: (arg: { item }) => Partial<ComponentProps<typeof View>>;
   highlightedIndex: number;
   embedded: boolean;
@@ -122,7 +114,7 @@ function CategoryList({
                   }}
                   data-testid="category-item-group"
                 >
-                  {item.groupName}
+                  {`${item.group?.name}`}
                 </div>
               )}
               <div
@@ -157,7 +149,7 @@ function CategoryList({
 }
 
 type CategoryAutocompleteProps = ComponentProps<typeof Autocomplete> & {
-  categoryGroups: CategoryGroup[];
+  categoryGroups: Array<CategoryGroupEntity>;
   showSplitOption?: boolean;
   groupHeaderStyle?: object;
 };
@@ -169,19 +161,23 @@ export default function CategoryAutocomplete({
   groupHeaderStyle,
   ...props
 }: CategoryAutocompleteProps) {
-  let categorySuggestions = useMemo(
+  let categorySuggestions: Array<
+    CategoryEntity & { group?: CategoryGroupEntity }
+  > = useMemo(
     () =>
       categoryGroups.reduce(
         (list, group) =>
           list.concat(
-            group.categories.map(category => ({
-              ...category,
-              groupName: group.name,
-            })),
+            group.categories
+              .filter(category => category.cat_group === group.id)
+              .map(category => ({
+                ...category,
+                group: group,
+              })),
           ),
-        showSplitOption ? [{ id: 'split', name: '' }] : [],
+        showSplitOption ? [{ id: 'split', name: '' } as CategoryEntity] : [],
       ),
-    [categoryGroups],
+    [showSplitOption, categoryGroups],
   );
 
   return (
diff --git a/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx b/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx
index 93d1df5312e..22e500cb673 100644
--- a/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx
+++ b/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx
@@ -1,6 +1,7 @@
 import React, { type ComponentProps } from 'react';
 
 import ArrowThinRight from '../../icons/v1/ArrowThinRight';
+import { type CSSProperties } from '../../style';
 import View from '../common/View';
 import CellValue from '../spreadsheet/CellValue';
 import useSheetValue from '../spreadsheet/useSheetValue';
@@ -11,17 +12,23 @@ type BalanceWithCarryoverProps = {
   carryover: ComponentProps<typeof CellValue>['binding'];
   balance: ComponentProps<typeof CellValue>['binding'];
   disabled?: boolean;
+  style?: CSSProperties;
+  balanceStyle?: CSSProperties;
+  carryoverStyle?: CSSProperties;
 };
 export default function BalanceWithCarryover({
   carryover,
   balance,
   disabled,
+  style,
+  balanceStyle,
+  carryoverStyle,
 }: BalanceWithCarryoverProps) {
   let carryoverValue = useSheetValue(carryover);
   let balanceValue = useSheetValue(balance);
 
   return (
-    <>
+    <View style={style}>
       <CellValue
         binding={balance}
         type="financial"
@@ -32,18 +39,20 @@ export default function BalanceWithCarryover({
             cursor: 'pointer',
             ':hover': { textDecoration: 'underline' },
           }),
+          ...balanceStyle,
         }}
       />
-      {carryoverValue === true && (
+      {carryoverValue && (
         <View
           style={{
             alignSelf: 'center',
             marginLeft: 2,
             position: 'absolute',
-            right: -4,
+            right: -8,
             top: 0,
             bottom: 0,
             justifyContent: 'center',
+            ...carryoverStyle,
           }}
         >
           <ArrowThinRight
@@ -53,6 +62,6 @@ export default function BalanceWithCarryover({
           />
         </View>
       )}
-    </>
+    </View>
   );
 }
diff --git a/packages/desktop-client/src/components/budget/BudgetPageHeader.js b/packages/desktop-client/src/components/budget/BudgetPageHeader.tsx
similarity index 72%
rename from packages/desktop-client/src/components/budget/BudgetPageHeader.js
rename to packages/desktop-client/src/components/budget/BudgetPageHeader.tsx
index 6f711901168..c5f3576c70b 100644
--- a/packages/desktop-client/src/components/budget/BudgetPageHeader.js
+++ b/packages/desktop-client/src/components/budget/BudgetPageHeader.tsx
@@ -1,4 +1,4 @@
-import React, { memo } from 'react';
+import React, { type ComponentProps, memo } from 'react';
 
 import * as monthUtils from 'loot-core/src/shared/months';
 
@@ -7,8 +7,15 @@ import View from '../common/View';
 import { MonthPicker } from './MonthPicker';
 import { getScrollbarWidth } from './util';
 
-const BudgetPageHeader = memo(
-  ({ startMonth, onMonthSelect, numMonths, monthBounds, style }) => {
+type BudgetPageHeaderProps = {
+  startMonth: string;
+  onMonthSelect: (month: string) => void;
+  numMonths: number;
+  monthBounds: ComponentProps<typeof MonthPicker>['monthBounds'];
+};
+
+const BudgetPageHeader = memo<BudgetPageHeaderProps>(
+  ({ startMonth, onMonthSelect, numMonths, monthBounds }) => {
     function getValidMonth(month) {
       let start = monthBounds.start;
       let end = monthUtils.subMonths(monthBounds.end, numMonths - 1);
diff --git a/packages/desktop-client/src/components/budget/CategoryGroupsContext.js b/packages/desktop-client/src/components/budget/CategoryGroupsContext.js
deleted file mode 100644
index b1d9eb6899e..00000000000
--- a/packages/desktop-client/src/components/budget/CategoryGroupsContext.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { createContext } from 'react';
-
-export let CategoryGroupsContext = createContext([]);
diff --git a/packages/desktop-client/src/components/budget/DynamicBudgetTable.js b/packages/desktop-client/src/components/budget/DynamicBudgetTable.js
deleted file mode 100644
index fec4a397866..00000000000
--- a/packages/desktop-client/src/components/budget/DynamicBudgetTable.js
+++ /dev/null
@@ -1,111 +0,0 @@
-import React, { forwardRef, useEffect } from 'react';
-import { useSelector } from 'react-redux';
-import AutoSizer from 'react-virtualized-auto-sizer';
-
-import { useActions } from '../../hooks/useActions';
-import View from '../common/View';
-
-import { useBudgetMonthCount } from './BudgetMonthCountContext';
-import BudgetPageHeader from './BudgetPageHeader';
-import BudgetTable from './BudgetTable';
-import { CategoryGroupsContext } from './CategoryGroupsContext';
-
-function getNumPossibleMonths(width) {
-  let estimatedTableWidth = width - 200;
-
-  if (estimatedTableWidth < 500) {
-    return 1;
-  } else if (estimatedTableWidth < 750) {
-    return 2;
-  } else if (estimatedTableWidth < 1000) {
-    return 3;
-  } else if (estimatedTableWidth < 1250) {
-    return 4;
-  } else if (estimatedTableWidth < 1500) {
-    return 5;
-  }
-
-  return 6;
-}
-
-const DynamicBudgetTableInner = forwardRef(
-  (
-    {
-      width,
-      height,
-      categoryGroups,
-      prewarmStartMonth,
-      startMonth,
-      maxMonths = 3,
-      monthBounds,
-      onMonthSelect: onMonthSelect_,
-      onPreload,
-      ...props
-    },
-    ref,
-  ) => {
-    let prefs = useSelector(state => state.prefs.local);
-    let { setDisplayMax } = useBudgetMonthCount();
-    let actions = useActions();
-
-    let numPossible = getNumPossibleMonths(width);
-    let numMonths = Math.min(numPossible, maxMonths);
-    let maxWidth = 200 + 500 * numMonths;
-
-    useEffect(() => {
-      setDisplayMax(numPossible);
-    }, [numPossible]);
-
-    function onMonthSelect(month) {
-      onMonthSelect_(month, numMonths);
-    }
-
-    return (
-      <CategoryGroupsContext.Provider value={categoryGroups}>
-        <View
-          style={{
-            width,
-            height,
-            alignItems: 'center',
-            opacity: width <= 0 || height <= 0 ? 0 : 1,
-          }}
-        >
-          <View style={{ width: '100%', maxWidth }}>
-            <BudgetPageHeader
-              startMonth={prewarmStartMonth}
-              numMonths={numMonths}
-              monthBounds={monthBounds}
-              onMonthSelect={onMonthSelect}
-            />
-            <BudgetTable
-              ref={ref}
-              categoryGroups={categoryGroups}
-              prewarmStartMonth={prewarmStartMonth}
-              startMonth={startMonth}
-              numMonths={numMonths}
-              monthBounds={monthBounds}
-              prefs={prefs}
-              {...actions}
-              {...props}
-            />
-          </View>
-        </View>
-      </CategoryGroupsContext.Provider>
-    );
-  },
-);
-
-export default forwardRef((props, ref) => {
-  return (
-    <AutoSizer>
-      {({ width, height }) => (
-        <DynamicBudgetTableInner
-          ref={ref}
-          width={width}
-          height={height}
-          {...props}
-        />
-      )}
-    </AutoSizer>
-  );
-});
diff --git a/packages/desktop-client/src/components/budget/DynamicBudgetTable.tsx b/packages/desktop-client/src/components/budget/DynamicBudgetTable.tsx
new file mode 100644
index 00000000000..51ab9df2761
--- /dev/null
+++ b/packages/desktop-client/src/components/budget/DynamicBudgetTable.tsx
@@ -0,0 +1,118 @@
+import React, { forwardRef, useEffect, type ComponentProps } from 'react';
+import { useSelector } from 'react-redux';
+import AutoSizer from 'react-virtualized-auto-sizer';
+
+import { useActions } from '../../hooks/useActions';
+import View from '../common/View';
+
+import { useBudgetMonthCount } from './BudgetMonthCountContext';
+import BudgetPageHeader from './BudgetPageHeader';
+import BudgetTable from './BudgetTable';
+
+function getNumPossibleMonths(width: number) {
+  let estimatedTableWidth = width - 200;
+
+  if (estimatedTableWidth < 500) {
+    return 1;
+  } else if (estimatedTableWidth < 750) {
+    return 2;
+  } else if (estimatedTableWidth < 1000) {
+    return 3;
+  } else if (estimatedTableWidth < 1250) {
+    return 4;
+  } else if (estimatedTableWidth < 1500) {
+    return 5;
+  }
+
+  return 6;
+}
+
+type DynamicBudgetTableInnerProps = {
+  width: number;
+  height: number;
+} & ComponentProps<typeof BudgetTable>;
+
+const DynamicBudgetTableInner = forwardRef<
+  BudgetTable,
+  DynamicBudgetTableInnerProps
+>(
+  (
+    {
+      width,
+      height,
+      categoryGroups,
+      prewarmStartMonth,
+      startMonth,
+      maxMonths = 3,
+      monthBounds,
+      onMonthSelect: onMonthSelect_,
+      onPreload,
+      ...props
+    },
+    ref,
+  ) => {
+    let prefs = useSelector(state => state.prefs.local);
+    let { setDisplayMax } = useBudgetMonthCount();
+    let actions = useActions();
+
+    let numPossible = getNumPossibleMonths(width);
+    let numMonths = Math.min(numPossible, maxMonths);
+    let maxWidth = 200 + 500 * numMonths;
+
+    useEffect(() => {
+      setDisplayMax(numPossible);
+    }, [numPossible]);
+
+    function onMonthSelect(month) {
+      onMonthSelect_(month, numMonths);
+    }
+
+    return (
+      <View
+        style={{
+          width,
+          height,
+          alignItems: 'center',
+          opacity: width <= 0 || height <= 0 ? 0 : 1,
+        }}
+      >
+        <View style={{ width: '100%', maxWidth }}>
+          <BudgetPageHeader
+            startMonth={prewarmStartMonth}
+            numMonths={numMonths}
+            monthBounds={monthBounds}
+            onMonthSelect={onMonthSelect}
+          />
+          <BudgetTable
+            ref={ref}
+            categoryGroups={categoryGroups}
+            prewarmStartMonth={prewarmStartMonth}
+            startMonth={startMonth}
+            numMonths={numMonths}
+            monthBounds={monthBounds}
+            prefs={prefs}
+            {...actions}
+            {...props}
+          />
+        </View>
+      </View>
+    );
+  },
+);
+
+export default forwardRef<BudgetTable, DynamicBudgetTableInnerProps>(
+  (props, ref) => {
+    return (
+      <AutoSizer>
+        {({ width, height }) => (
+          <DynamicBudgetTableInner
+            ref={ref}
+            width={width}
+            height={height}
+            {...props}
+          />
+        )}
+      </AutoSizer>
+    );
+  },
+);
diff --git a/packages/desktop-client/src/components/budget/MobileBudget.js b/packages/desktop-client/src/components/budget/MobileBudget.js
index 1499783b722..c992a255fce 100644
--- a/packages/desktop-client/src/components/budget/MobileBudget.js
+++ b/packages/desktop-client/src/components/budget/MobileBudget.js
@@ -363,11 +363,11 @@ class Budget extends Component {
             type={budgetType}
             month={currentMonth}
             monthBounds={bounds}
-            editMode={editMode}
             navigation={navigation}
             //   refreshControl={
             //     <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
             //   }
+            editMode={editMode}
             onEditMode={flag => this.setState({ editMode: flag })}
             onShowBudgetDetails={this.onShowBudgetDetails}
             onPrevMonth={this.onPrevMonth}
@@ -382,6 +382,7 @@ class Budget extends Component {
             onReorderGroup={this.onReorderGroup}
             onOpenActionSheet={() => {}} //this.onOpenActionSheet}
             onBudgetAction={applyBudgetAction}
+            onRefresh={onRefresh}
             savePrefs={savePrefs}
           />
         )}
diff --git a/packages/desktop-client/src/components/budget/MobileBudgetTable.js b/packages/desktop-client/src/components/budget/MobileBudgetTable.js
index 0deb57870a6..b650989f76e 100644
--- a/packages/desktop-client/src/components/budget/MobileBudgetTable.js
+++ b/packages/desktop-client/src/components/budget/MobileBudgetTable.js
@@ -1,4 +1,4 @@
-import React, { memo, useState } from 'react';
+import React, { memo, useEffect, useRef, useState } from 'react';
 import { useSelector } from 'react-redux';
 
 import memoizeOne from 'memoize-one';
@@ -8,9 +8,7 @@ import * as monthUtils from 'loot-core/src/shared/months';
 
 import ArrowThinLeft from '../../icons/v1/ArrowThinLeft';
 import ArrowThinRight from '../../icons/v1/ArrowThinRight';
-import Close from '../../icons/v1/Close';
 import DotsHorizontalTriple from '../../icons/v1/DotsHorizontalTriple';
-import EditPencil from '../../icons/v1/EditPencil';
 import { useResponsive } from '../../ResponsiveProvider';
 import { theme, styles } from '../../style';
 import Button from '../common/Button';
@@ -20,6 +18,7 @@ import Label from '../common/Label';
 import Menu from '../common/Menu';
 import Text from '../common/Text';
 import View from '../common/View';
+import PullToRefresh from '../responsive/PullToRefresh';
 import { useServerURL } from '../ServerContext';
 import CellValue from '../spreadsheet/CellValue';
 import NamespaceContext from '../spreadsheet/NamespaceContext';
@@ -34,7 +33,10 @@ import { AmountInput } from '../util/AmountInput';
 // } from '../mobile/AmountInput';
 
 // import { DragDrop, Draggable, Droppable, DragDropHighlight } from './dragdrop';
+import BalanceWithCarryover from './BalanceWithCarryover';
 import { ListItem, ROW_HEIGHT } from './MobileTable';
+import BalanceTooltip from './rollover/BalanceTooltip';
+import { makeAmountGrey } from './util';
 
 function ToBudget({ toBudget, onClick }) {
   let amount = useSheetValue(toBudget);
@@ -50,6 +52,7 @@ function ToBudget({ toBudget, onClick }) {
           ...styles.underlinedText,
           color: theme.formInputText,
           flexShrink: 0,
+          textAlign: 'left',
         }}
       />
       <CellValue
@@ -78,18 +81,17 @@ function Saved({ projected }) {
       style={{
         flexDirection: 'column',
         alignItems: 'flex-start',
-        flexBasis: '80px',
       }}
     >
       {projected ? (
         <Label
           title="PROJECTED SAVINGS"
-          style={{ color: theme.formInputText }}
+          style={{ color: theme.formInputText, textAlign: 'left' }}
         />
       ) : (
         <Label
           title={isNegative ? 'OVERSPENT' : 'SAVED'}
-          style={{ color: theme.formInputText }}
+          style={{ color: theme.formInputText, textAlign: 'left' }}
         />
       )}
 
@@ -113,13 +115,13 @@ function Saved({ projected }) {
 function BudgetCell({
   name,
   binding,
-  editing,
   style,
   textStyle,
   categoryId,
   month,
   onBudgetAction,
-  onEditing,
+  onEdit,
+  isEditing,
 }) {
   let sheetValue = useSheetValue(binding);
 
@@ -131,34 +133,31 @@ function BudgetCell({
   }
 
   function onAmountClick(e) {
-    onEditing?.(categoryId);
+    onEdit?.(categoryId);
   }
 
   return (
-    <View
-      style={style}
-      onPointerUp={onAmountClick}
-      onPointerDown={e => e.preventDefault()}
-    >
-      {editing ? (
+    <View style={style}>
+      {isEditing ? (
         <AmountInput
           initialValue={sheetValue}
           zeroSign="+"
           style={{
-            height: ROW_HEIGHT - 4,
+            height: ROW_HEIGHT,
             transform: 'translateX(6px)',
           }}
-          focused={editing}
+          focused={isEditing}
           textStyle={{ ...styles.smallText, ...textStyle }}
           onChange={updateBudgetAmount}
-          onEdit={onEditing}
-          onBlur={() => onEditing?.(null)}
+          onBlur={() => onEdit?.(null)}
         />
       ) : (
         <View
+          role="button"
           style={{
             justifyContent: 'center',
-            height: ROW_HEIGHT - 4,
+            alignItems: 'flex-end',
+            height: ROW_HEIGHT,
           }}
         >
           <CellValue
@@ -169,7 +168,10 @@ function BudgetCell({
               ...textStyle,
               ...styles.underlinedText,
             }}
+            getStyle={makeAmountGrey}
             data-testid={name}
+            onPointerUp={onAmountClick}
+            onPointerDown={e => e.preventDefault()}
           />
         </View>
       )}
@@ -218,32 +220,49 @@ function ExpenseCategoryPreview({ name, pending, style }) {
 
 const ExpenseCategory = memo(function ExpenseCategory({
   category,
-  editing,
   index,
   // gestures,
-  editMode,
   blank,
   style,
   month,
-  onEditingBudget,
+  editMode,
+  isEditing,
+  onEdit,
+  isEditingBudget,
+  onEditBudget,
   onSave,
   onDelete,
+  isBudgetActionMenuOpen,
+  onOpenBudgetActionMenu,
   onBudgetAction,
   show3Cols,
   showBudgetedCol,
 }) {
-  let opacity = editMode || blank ? 0 : 1;
+  let opacity = blank ? 0 : 1;
+  let showEditables = editMode || isEditing;
 
   let [categoryName, setCategoryName] = useState(category.name);
   let [isHidden, setIsHidden] = useState(category.hidden);
 
   let budgeted = rolloverBudget.catBudgeted(category.id);
-  let balance = rolloverBudget.catBalance(category.id);
   let spent = rolloverBudget.catSumAmount(category.id);
 
   let tooltip = useTooltip();
+  let balanceTooltip = useTooltip();
+
+  useEffect(() => {
+    if (isBudgetActionMenuOpen) {
+      balanceTooltip.open();
+    }
+  }, [isBudgetActionMenuOpen, balanceTooltip]);
 
-  let onTooltipClose = () => {
+  useEffect(() => {
+    if (!isEditing && tooltip.isOpen) {
+      tooltip.close();
+    }
+  }, [isEditing, tooltip]);
+
+  let onSubmit = () => {
     if (categoryName) {
       onSave?.({
         ...category,
@@ -252,11 +271,11 @@ const ExpenseCategory = memo(function ExpenseCategory({
     } else {
       setCategoryName(category.name);
     }
-    tooltip.close();
+    onEdit?.(null);
   };
 
   let onMenuSelect = type => {
-    tooltip.close();
+    onEdit?.(null);
     switch (type) {
       case 'toggle-visibility':
         setIsHidden(!isHidden);
@@ -273,123 +292,188 @@ const ExpenseCategory = memo(function ExpenseCategory({
     }
   };
 
+  let listItemRef = useRef();
+  let inputRef = useRef();
+
   let content = (
     <ListItem
       style={{
-        backgroundColor: editing ? theme.altTableTextEditing : 'transparent',
+        backgroundColor: isEditingBudget
+          ? theme.altTableTextEditing
+          : 'transparent',
         borderBottomWidth: 0,
         borderTopWidth: index > 0 ? 1 : 0,
         opacity: isHidden ? 0.5 : undefined,
         ...style,
       }}
       data-testid="row"
+      innerRef={listItemRef}
     >
-      <View style={{ flex: 1 }}>
+      <View
+        style={{
+          ...(!showEditables && { display: 'none' }),
+          flexDirection: 'row',
+          flex: 1,
+          justifyContent: 'center',
+          alignItems: 'center',
+          height: ROW_HEIGHT,
+        }}
+      >
+        <InputWithContent
+          focused={isEditing}
+          inputRef={inputRef}
+          rightContent={
+            <>
+              <Button
+                type="bare"
+                style={{ padding: 10 }}
+                {...tooltip.getOpenEvents()}
+              >
+                <DotsHorizontalTriple width={12} height={12} />
+              </Button>
+              {tooltip.isOpen && (
+                <Tooltip
+                  position="bottom-stretch"
+                  offset={1}
+                  style={{ padding: 0 }}
+                  onClose={() => {
+                    tooltip.close();
+                    inputRef.current?.focus();
+                  }}
+                >
+                  <Menu
+                    onMenuSelect={onMenuSelect}
+                    items={[
+                      {
+                        name: 'toggle-visibility',
+                        text: isHidden ? 'Show' : 'Hide',
+                      },
+                      {
+                        name: 'delete',
+                        text: 'Delete',
+                      },
+                    ]}
+                  />
+                </Tooltip>
+              )}
+            </>
+          }
+          style={{ width: '100%' }}
+          placeholder="Category Name"
+          value={categoryName}
+          onUpdate={setCategoryName}
+          onEnter={onSubmit}
+          onBlur={e => {
+            if (!listItemRef.current?.contains(e.relatedTarget)) {
+              onSubmit();
+            }
+          }}
+        />
+      </View>
+      <View
+        role="button"
+        style={{ ...(showEditables && { display: 'none' }), flex: 1 }}
+      >
         <Text
           style={{
             ...styles.smallText,
             ...styles.underlinedText,
-            whiteSpace: 'nowrap',
-            overflow: 'hidden',
-            textOverflow: 'ellipsis',
+            ...styles.lineClamp(2),
           }}
+          onPointerUp={() => onEdit?.(category.id)}
           data-testid="category-name"
-          {...tooltip.getOpenEvents()}
         >
           {category.name}
-          {tooltip.isOpen && (
-            <Tooltip
-              position="bottom-left"
-              width={300}
-              offset={5}
-              style={{ padding: 0 }}
-              onClose={onTooltipClose}
-            >
-              <View style={{ flexDirection: 'row' }}>
-                <InputWithContent
-                  style={{ flex: 1, margin: '10px 0px 10px 10px' }}
-                  leftContent={
-                    <Button type="bare" disabled>
-                      <EditPencil width={9} height={9} />
-                    </Button>
-                  }
-                  placeholder="Category Name"
-                  value={categoryName}
-                  onUpdate={setCategoryName}
-                  onEnter={onTooltipClose}
-                />
-                <Button
-                  type="bare"
-                  style={{ padding: 10 }}
-                  onPointerUp={() => {
-                    setCategoryName(category.name);
-                    tooltip.close();
-                  }}
-                >
-                  <Close width={9} height={9} />
-                </Button>
-              </View>
-              <Menu
-                onMenuSelect={onMenuSelect}
-                items={[
-                  Menu.line,
-                  {
-                    name: 'toggle-visibility',
-                    text: isHidden ? 'Show' : 'Hide',
-                  },
-                  {
-                    name: 'delete',
-                    text: 'Delete',
-                  },
-                ]}
-              />
-            </Tooltip>
-          )}
         </Text>
       </View>
       <View
         style={{
+          ...(showEditables && { display: 'none' }),
+          justifyContent: 'center',
           alignItems: 'center',
           flexDirection: 'row',
           opacity,
         }}
       >
-        {show3Cols || showBudgetedCol ? (
-          <BudgetCell
-            name="budgeted"
-            binding={budgeted}
-            editing={editing}
-            style={{ width: 90 }}
-            textStyle={{ ...styles.smallText, textAlign: 'right' }}
-            categoryId={category.id}
-            month={month}
-            onBudgetAction={onBudgetAction}
-            onEditing={onEditingBudget}
-          />
-        ) : null}
-        {show3Cols || !showBudgetedCol ? (
+        <BudgetCell
+          name="budgeted"
+          binding={budgeted}
+          style={{
+            ...(!show3Cols && !showBudgetedCol && { display: 'none' }),
+            width: 90,
+          }}
+          textStyle={{ ...styles.smallText, textAlign: 'right' }}
+          categoryId={category.id}
+          month={month}
+          onBudgetAction={onBudgetAction}
+          isEditing={isEditingBudget}
+          onEdit={onEditBudget}
+        />
+        <View
+          style={{
+            ...(!show3Cols && showBudgetedCol && { display: 'none' }),
+            justifyContent: 'center',
+            alignItems: 'flex-end',
+            width: 90,
+            height: ROW_HEIGHT,
+          }}
+        >
           <CellValue
             name="spent"
             binding={spent}
             style={{
               ...styles.smallText,
-              width: 90,
               textAlign: 'right',
             }}
+            getStyle={makeAmountGrey}
             type="financial"
           />
-        ) : null}
-        <CellValue
-          name="balance"
-          binding={balance}
+        </View>
+        <View
           style={{
-            ...styles.smallText,
+            ...styles.noTapHighlight,
+            justifyContent: 'center',
+            alignItems: 'flex-end',
             width: 90,
-            textAlign: 'right',
+            height: ROW_HEIGHT,
           }}
-          getStyle={value => value < 0 && { color: theme.errorText }}
-          type="financial"
-        />
+        >
+          <span
+            role="button"
+            onPointerUp={() => onOpenBudgetActionMenu?.(category.id)}
+            onPointerDown={e => e.preventDefault()}
+          >
+            <BalanceWithCarryover
+              carryover={rolloverBudget.catCarryover(category.id)}
+              balance={rolloverBudget.catBalance(category.id)}
+              balanceStyle={{
+                ...styles.smallText,
+                ...styles.underlinedText,
+              }}
+            />
+            {balanceTooltip.isOpen && (
+              <BalanceTooltip
+                offset={5}
+                categoryId={category.id}
+                tooltip={balanceTooltip}
+                monthIndex={monthUtils.getMonthIndex(month)}
+                onBudgetAction={(monthIndex, action, arg) => {
+                  onBudgetAction?.(
+                    monthUtils.getMonthFromIndex(
+                      monthUtils.getYear(month),
+                      monthIndex,
+                    ),
+                    action,
+                    arg,
+                  );
+                }}
+                onClose={() => {
+                  onOpenBudgetActionMenu?.(null);
+                }}
+              />
+            )}
+          </span>
+        </View>
       </View>
     </ListItem>
   );
@@ -431,6 +515,8 @@ const ExpenseCategory = memo(function ExpenseCategory({
 const ExpenseGroupTotals = memo(function ExpenseGroupTotals({
   group,
   editMode,
+  isEditing,
+  onEdit,
   blank,
   onAddCategory,
   onSave,
@@ -438,14 +524,21 @@ const ExpenseGroupTotals = memo(function ExpenseGroupTotals({
   show3Cols,
   showBudgetedCol,
 }) {
-  let opacity = editMode || blank ? 0 : 1;
+  let opacity = blank ? 0 : 1;
+  let showEditables = editMode || isEditing;
 
   let [groupName, setGroupName] = useState(group.name);
   let [isHidden, setIsHidden] = useState(group.hidden);
 
   let tooltip = useTooltip();
 
-  let onTooltipClose = () => {
+  useEffect(() => {
+    if (!isEditing && tooltip.isOpen) {
+      tooltip.close();
+    }
+  }, [isEditing]);
+
+  let onSubmit = () => {
     if (groupName) {
       onSave?.({
         ...group,
@@ -454,11 +547,11 @@ const ExpenseGroupTotals = memo(function ExpenseGroupTotals({
     } else {
       setGroupName(group.name);
     }
-    tooltip.close();
+    onEdit?.(null);
   };
 
   let onMenuSelect = type => {
-    tooltip.close();
+    onEdit?.(null);
     switch (type) {
       case 'add-category':
         onAddCategory?.(group.id, group.is_income);
@@ -478,6 +571,9 @@ const ExpenseGroupTotals = memo(function ExpenseGroupTotals({
     }
   };
 
+  let listItemRef = useRef();
+  let inputRef = useRef();
+
   let content = (
     <ListItem
       style={{
@@ -487,116 +583,157 @@ const ExpenseGroupTotals = memo(function ExpenseGroupTotals({
         opacity: isHidden ? 0.5 : undefined,
       }}
       data-testid="totals"
+      innerRef={listItemRef}
     >
-      <View style={{ flex: 1 }}>
+      <View
+        style={{
+          ...(!showEditables && { display: 'none' }),
+          flexDirection: 'row',
+          flex: 1,
+          justifyContent: 'center',
+          alignItems: 'center',
+          height: ROW_HEIGHT,
+        }}
+      >
+        <InputWithContent
+          focused={isEditing}
+          inputRef={inputRef}
+          rightContent={
+            <>
+              <Button
+                type="bare"
+                style={{ padding: 10 }}
+                {...tooltip.getOpenEvents()}
+              >
+                <DotsHorizontalTriple width={12} height={12} />
+              </Button>
+              {tooltip.isOpen && (
+                <Tooltip
+                  position="bottom-stretch"
+                  offset={1}
+                  style={{ padding: 0 }}
+                  onClose={() => {
+                    tooltip.close();
+                    inputRef.current?.focus();
+                  }}
+                >
+                  <Menu
+                    onMenuSelect={onMenuSelect}
+                    items={[
+                      {
+                        name: 'add-category',
+                        text: 'Add category',
+                      },
+                      {
+                        name: 'toggle-visibility',
+                        text: isHidden ? 'Show' : 'Hide',
+                      },
+                      {
+                        name: 'delete',
+                        text: 'Delete',
+                      },
+                    ]}
+                  />
+                </Tooltip>
+              )}
+            </>
+          }
+          style={{ width: '100%' }}
+          placeholder="Category Group Name"
+          value={groupName}
+          onUpdate={setGroupName}
+          onEnter={onSubmit}
+          onBlur={e => {
+            if (!listItemRef.current?.contains(e.relatedTarget)) {
+              onSubmit();
+            }
+          }}
+        />
+      </View>
+      <View
+        role="button"
+        style={{ ...(showEditables && { display: 'none' }), flex: 1 }}
+      >
         <Text
+          tabIndex={-1}
           style={{
             ...styles.smallText,
             ...styles.underlinedText,
+            ...styles.lineClamp(2),
             fontWeight: '500',
-            whiteSpace: 'nowrap',
-            overflow: 'hidden',
-            textOverflow: 'ellipsis',
           }}
+          onPointerUp={() => onEdit?.(group.id)}
           data-testid="name"
-          {...tooltip.getOpenEvents()}
         >
           {group.name}
-          {tooltip.isOpen && (
-            <Tooltip
-              position="bottom-left"
-              width={300}
-              offset={5}
-              style={{ padding: 0 }}
-              onClose={onTooltipClose}
-            >
-              <View style={{ flexDirection: 'row' }}>
-                <InputWithContent
-                  style={{ flex: 1, margin: '10px 0px 10px 10px' }}
-                  leftContent={
-                    <Button type="bare" disabled>
-                      <EditPencil width={9} height={9} />
-                    </Button>
-                  }
-                  placeholder="Category Group Name"
-                  value={groupName}
-                  onUpdate={setGroupName}
-                  onEnter={onTooltipClose}
-                />
-                <Button
-                  type="bare"
-                  style={{ padding: 10 }}
-                  onPointerUp={() => {
-                    setGroupName(group.name);
-                    tooltip.close();
-                  }}
-                >
-                  <Close width={9} height={9} />
-                </Button>
-              </View>
-              <Menu
-                onMenuSelect={onMenuSelect}
-                items={[
-                  Menu.line,
-                  {
-                    name: 'add-category',
-                    text: 'Add category',
-                  },
-                  {
-                    name: 'toggle-visibility',
-                    text: isHidden ? 'Show' : 'Hide',
-                  },
-                  {
-                    name: 'delete',
-                    text: 'Delete',
-                  },
-                ]}
-              />
-            </Tooltip>
-          )}
         </Text>
       </View>
       <View
         style={{
+          ...(showEditables && { display: 'none' }),
           flexDirection: 'row',
+          justifyContent: 'center',
           alignItems: 'center',
+          height: ROW_HEIGHT,
           opacity,
         }}
       >
-        {show3Cols || showBudgetedCol ? (
+        <View
+          style={{
+            ...(!show3Cols && !showBudgetedCol && { display: 'none' }),
+            width: 90,
+            height: ROW_HEIGHT,
+            justifyContent: 'center',
+            alignItems: 'flex-end',
+          }}
+        >
           <CellValue
             binding={rolloverBudget.groupBudgeted(group.id)}
             style={{
               ...styles.smallText,
-              width: 90,
               fontWeight: '500',
               textAlign: 'right',
             }}
             type="financial"
           />
-        ) : null}
-        {show3Cols || !showBudgetedCol ? (
+        </View>
+        <View
+          style={{
+            ...(!show3Cols && showBudgetedCol && { display: 'none' }),
+            width: 90,
+            height: ROW_HEIGHT,
+            justifyContent: 'center',
+            alignItems: 'flex-end',
+          }}
+        >
           <CellValue
             binding={rolloverBudget.groupSumAmount(group.id)}
             style={{
               ...styles.smallText,
-              width: 90,
               fontWeight: '500',
               textAlign: 'right',
             }}
             type="financial"
           />
-        ) : null}
-        <CellValue
-          binding={rolloverBudget.groupBalance(group.id)}
+        </View>
+        <View
           style={{
-            ...styles.smallText,
             width: 90,
-            fontWeight: '500',
-            textAlign: 'right',
+            height: ROW_HEIGHT,
+            justifyContent: 'center',
+            alignItems: 'flex-end',
           }}
-          type="financial"
-        />
+        >
+          <CellValue
+            binding={rolloverBudget.groupBalance(group.id)}
+            style={{
+              ...styles.smallText,
+              fontWeight: '500',
+              textAlign: 'right',
+            }}
+            type="financial"
+          />
+        </View>
       </View>
 
       {/* {editMode && (
@@ -635,18 +772,26 @@ const IncomeGroupTotals = memo(function IncomeGroupTotals({
   budget,
   balance,
   style,
-  nameTextStyle,
-  amountTextStyle,
   onAddCategory,
   onSave,
   onDelete,
+  editMode,
+  isEditing,
+  onEdit,
 }) {
   let [groupName, setGroupName] = useState(group.name);
   let [isHidden, setIsHidden] = useState(group.hidden);
+  let showEditables = editMode || isEditing;
 
   let tooltip = useTooltip();
 
-  let onTooltipClose = () => {
+  useEffect(() => {
+    if (!isEditing && tooltip.isOpen) {
+      tooltip.close();
+    }
+  }, [isEditing]);
+
+  let onSubmit = () => {
     if (groupName) {
       onSave?.({
         ...group,
@@ -655,11 +800,11 @@ const IncomeGroupTotals = memo(function IncomeGroupTotals({
     } else {
       setGroupName(group.name);
     }
-    tooltip.close();
+    onEdit?.(null);
   };
 
   let onMenuSelect = type => {
-    tooltip.close();
+    onEdit?.(null);
     switch (type) {
       case 'add-category':
         onAddCategory?.(group.id, group.is_income);
@@ -679,6 +824,9 @@ const IncomeGroupTotals = memo(function IncomeGroupTotals({
     }
   };
 
+  let listItemRef = useRef();
+  let inputRef = useRef();
+
   return (
     <ListItem
       style={{
@@ -689,90 +837,136 @@ const IncomeGroupTotals = memo(function IncomeGroupTotals({
         opacity: isHidden ? 0.5 : undefined,
         ...style,
       }}
+      innerRef={listItemRef}
     >
-      <View>
+      <View
+        style={{
+          ...(!showEditables && { display: 'none' }),
+          flexDirection: 'row',
+          flex: 1,
+          justifyContent: 'center',
+          alignItems: 'center',
+          height: ROW_HEIGHT,
+        }}
+      >
+        <InputWithContent
+          focused={isEditing}
+          inputRef={inputRef}
+          rightContent={
+            <>
+              <Button
+                type="bare"
+                style={{ padding: 10 }}
+                {...tooltip.getOpenEvents()}
+              >
+                <DotsHorizontalTriple width={12} height={12} />
+              </Button>
+              {tooltip.isOpen && (
+                <Tooltip
+                  position="bottom-stretch"
+                  offset={1}
+                  style={{ padding: 0 }}
+                  onClose={() => {
+                    tooltip.close();
+                    inputRef.current?.focus();
+                  }}
+                >
+                  <Menu
+                    onMenuSelect={onMenuSelect}
+                    items={[
+                      {
+                        name: 'add-category',
+                        text: 'Add category',
+                      },
+                      {
+                        name: 'toggle-visibility',
+                        text: isHidden ? 'Show' : 'Hide',
+                      },
+                      {
+                        name: 'delete',
+                        text: 'Delete',
+                      },
+                    ]}
+                  />
+                </Tooltip>
+              )}
+            </>
+          }
+          style={{ width: '100%' }}
+          placeholder="Category Group Name"
+          value={groupName}
+          onUpdate={setGroupName}
+          onEnter={onSubmit}
+          onBlur={e => {
+            if (!listItemRef.current?.contains(e.relatedTarget)) {
+              onSubmit();
+            }
+          }}
+        />
+      </View>
+      <View
+        role="button"
+        style={{
+          ...(showEditables && { display: 'none' }),
+          flex: 1,
+          justifyContent: 'center',
+          alignItems: 'flex-start',
+          height: ROW_HEIGHT,
+        }}
+      >
         <Text
-          style={{ ...styles.smallText, ...nameTextStyle }}
+          style={{
+            ...styles.smallText,
+            ...styles.underlinedText,
+            ...styles.lineClamp(2),
+            fontWeight: '500',
+          }}
+          onPointerUp={() => onEdit?.(group.id)}
           data-testid="name"
-          {...tooltip.getOpenEvents()}
         >
           {group.name}
-          {tooltip.isOpen && (
-            <Tooltip
-              position="bottom-left"
-              width={300}
-              offset={5}
-              style={{ padding: 0 }}
-              onClose={onTooltipClose}
-            >
-              <View style={{ flexDirection: 'row' }}>
-                <InputWithContent
-                  style={{ flex: 1, margin: '10px 0px 10px 10px' }}
-                  leftContent={
-                    <Button type="bare" disabled>
-                      <EditPencil width={9} height={9} />
-                    </Button>
-                  }
-                  placeholder="Category Group Name"
-                  value={groupName}
-                  onUpdate={setGroupName}
-                  onEnter={onTooltipClose}
-                />
-                <Button
-                  type="bare"
-                  style={{ padding: 10 }}
-                  onPointerUp={() => {
-                    setGroupName(group.name);
-                    tooltip.close();
-                  }}
-                >
-                  <Close width={9} height={9} />
-                </Button>
-              </View>
-              <Menu
-                onMenuSelect={onMenuSelect}
-                items={[
-                  Menu.line,
-                  {
-                    name: 'add-category',
-                    text: 'Add category',
-                  },
-                  {
-                    name: 'toggle-visibility',
-                    text: isHidden ? 'Show' : 'Hide',
-                  },
-                  {
-                    name: 'delete',
-                    text: 'Delete',
-                  },
-                ]}
-              />
-            </Tooltip>
-          )}
         </Text>
       </View>
       {budget && (
+        <View
+          style={{
+            ...(showEditables && { display: 'none' }),
+            justifyContent: 'center',
+            alignItems: 'flex-end',
+            width: 90,
+            height: ROW_HEIGHT,
+          }}
+        >
+          <CellValue
+            binding={budget}
+            style={{
+              ...styles.smallText,
+              textAlign: 'right',
+              fontWeight: '500',
+            }}
+            type="financial"
+          />
+        </View>
+      )}
+      <View
+        style={{
+          ...(showEditables && { display: 'none' }),
+          justifyContent: 'center',
+          alignItems: 'flex-end',
+          width: 90,
+          height: ROW_HEIGHT,
+        }}
+      >
         <CellValue
-          binding={budget}
+          binding={balance}
           style={{
             ...styles.smallText,
             textAlign: 'right',
-            ...amountTextStyle,
-            flex: 1,
+            fontWeight: '500',
           }}
           type="financial"
         />
-      )}
-      <CellValue
-        binding={balance}
-        style={{
-          ...styles.smallText,
-          textAlign: 'right',
-          ...amountTextStyle,
-          flex: 1,
-        }}
-        type="financial"
-      />
+      </View>
     </ListItem>
   );
 });
@@ -782,17 +976,25 @@ const IncomeCategory = memo(function IncomeCategory({
   budget,
   balance,
   style,
-  nameTextStyle,
-  amountTextStyle,
   onSave,
   onDelete,
+  editMode,
+  isEditing,
+  onEdit,
 }) {
   let [categoryName, setCategoryName] = useState(category.name);
   let [isHidden, setIsHidden] = useState(category.hidden);
+  let showEditables = editMode || isEditing;
 
   let tooltip = useTooltip();
 
-  let onTooltipClose = () => {
+  useEffect(() => {
+    if (!isEditing && tooltip.isOpen) {
+      tooltip.close();
+    }
+  }, [isEditing]);
+
+  let onSubmit = () => {
     if (categoryName) {
       onSave?.({
         ...category,
@@ -801,11 +1003,11 @@ const IncomeCategory = memo(function IncomeCategory({
     } else {
       setCategoryName(category.name);
     }
-    tooltip.close();
+    onEdit?.(null);
   };
 
   let onMenuSelect = type => {
-    tooltip.close();
+    onEdit?.(null);
     switch (type) {
       case 'toggle-visibility':
         setIsHidden(!isHidden);
@@ -822,6 +1024,9 @@ const IncomeCategory = memo(function IncomeCategory({
     }
   };
 
+  let listItemRef = useRef();
+  let inputRef = useRef();
+
   return (
     <ListItem
       style={{
@@ -832,90 +1037,130 @@ const IncomeCategory = memo(function IncomeCategory({
         opacity: isHidden ? 0.5 : undefined,
         ...style,
       }}
+      innerRef={listItemRef}
     >
-      <View>
+      <View
+        style={{
+          ...(!showEditables && { display: 'none' }),
+          flexDirection: 'row',
+          flex: 1,
+          justifyContent: 'center',
+          alignItems: 'center',
+          height: ROW_HEIGHT,
+        }}
+      >
+        <InputWithContent
+          focused={isEditing}
+          inputRef={inputRef}
+          rightContent={
+            <>
+              <Button
+                type="bare"
+                style={{ padding: 10 }}
+                {...tooltip.getOpenEvents()}
+              >
+                <DotsHorizontalTriple width={12} height={12} />
+              </Button>
+              {tooltip.isOpen && (
+                <Tooltip
+                  position="bottom-stretch"
+                  offset={1}
+                  style={{ padding: 0 }}
+                  onClose={() => {
+                    tooltip.close();
+                    inputRef.current?.focus();
+                  }}
+                >
+                  <Menu
+                    onMenuSelect={onMenuSelect}
+                    items={[
+                      {
+                        name: 'toggle-visibility',
+                        text: isHidden ? 'Show' : 'Hide',
+                      },
+                      {
+                        name: 'delete',
+                        text: 'Delete',
+                      },
+                    ]}
+                  />
+                </Tooltip>
+              )}
+            </>
+          }
+          style={{ width: '100%' }}
+          placeholder="Category Name"
+          value={categoryName}
+          onUpdate={setCategoryName}
+          onEnter={onSubmit}
+          onBlur={e => {
+            if (!listItemRef.current?.contains(e.relatedTarget)) {
+              onSubmit();
+            }
+          }}
+        />
+      </View>
+      <View
+        role="button"
+        style={{
+          ...(showEditables && { display: 'none' }),
+          flex: 1,
+          justifyContent: 'center',
+          alignItems: 'flex-start',
+          height: ROW_HEIGHT,
+        }}
+      >
         <Text
+          tabIndex={-1}
           style={{
             ...styles.smallText,
-            ...nameTextStyle,
             ...styles.underlinedText,
+            ...styles.lineClamp(2),
           }}
+          onPointerUp={() => onEdit?.(category.id)}
           data-testid="name"
-          {...tooltip.getOpenEvents()}
         >
           {category.name}
-          {tooltip.isOpen && (
-            <Tooltip
-              position="bottom-left"
-              width={300}
-              offset={5}
-              style={{ padding: 0 }}
-              onClose={onTooltipClose}
-            >
-              <View style={{ flexDirection: 'row' }}>
-                <InputWithContent
-                  style={{ flex: 1, margin: '10px 0px 10px 10px' }}
-                  leftContent={
-                    <Button type="bare" disabled>
-                      <EditPencil width={9} height={9} />
-                    </Button>
-                  }
-                  placeholder="Category Name"
-                  value={categoryName}
-                  onUpdate={setCategoryName}
-                  onEnter={onTooltipClose}
-                />
-                <Button
-                  type="bare"
-                  style={{ padding: 10 }}
-                  onPointerUp={() => {
-                    setCategoryName(category.name);
-                    tooltip.close();
-                  }}
-                >
-                  <Close width={9} height={9} />
-                </Button>
-              </View>
-              <Menu
-                onMenuSelect={onMenuSelect}
-                items={[
-                  Menu.line,
-                  {
-                    name: 'toggle-visibility',
-                    text: isHidden ? 'Show' : 'Hide',
-                  },
-                  {
-                    name: 'delete',
-                    text: 'Delete',
-                  },
-                ]}
-              />
-            </Tooltip>
-          )}
         </Text>
       </View>
       {budget && (
+        <View
+          style={{
+            ...(showEditables && { display: 'none' }),
+            justifyContent: 'center',
+            alignItems: 'flex-end',
+            width: 90,
+            height: ROW_HEIGHT,
+          }}
+        >
+          <CellValue
+            binding={budget}
+            style={{
+              ...styles.smallText,
+              textAlign: 'right',
+            }}
+            type="financial"
+          />
+        </View>
+      )}
+      <View
+        style={{
+          ...(showEditables && { display: 'none' }),
+          justifyContent: 'center',
+          alignItems: 'flex-end',
+          width: 90,
+          height: ROW_HEIGHT,
+        }}
+      >
         <CellValue
-          binding={budget}
+          binding={balance}
           style={{
             ...styles.smallText,
             textAlign: 'right',
-            ...amountTextStyle,
-            flex: 1,
           }}
           type="financial"
         />
-      )}
-      <CellValue
-        binding={balance}
-        style={{
-          ...styles.smallText,
-          textAlign: 'right',
-          ...amountTextStyle,
-          flex: 1,
-        }}
-        type="financial"
-      />
+      </View>
     </ListItem>
   );
 });
@@ -961,9 +1206,15 @@ const IncomeCategory = memo(function IncomeCategory({
 
 const ExpenseGroup = memo(function ExpenseGroup({
   group,
-  editingId,
-  onEditingCategoryBudget,
   editMode,
+  editingGroupId,
+  onEditGroup,
+  editingCategoryId,
+  onEditCategory,
+  editingBudgetCategoryId,
+  onEditCategoryBudget,
+  openBudgetActionMenuId,
+  onOpenBudgetActionMenu,
   // gestures,
   month,
   onSaveCategory,
@@ -1024,13 +1275,18 @@ const ExpenseGroup = memo(function ExpenseGroup({
         onAddCategory={onAddCategory}
         onSave={onSave}
         onDelete={onDelete}
+        isEditing={editingGroupId === group.id}
+        onEdit={onEditGroup}
         // onReorderCategory={onReorderCategory}
       />
 
       {group.categories
         .filter(category => !category.hidden || showHiddenCategories)
         .map((category, index) => {
-          const editing = editingId === category.id;
+          const isEditingCategory = editingCategoryId === category.id;
+          const isEditingCategoryBudget =
+            editingBudgetCategoryId === category.id;
+          const isBudgetActionMenuOpen = openBudgetActionMenuId === category.id;
           return (
             <ExpenseCategory
               show3Cols={show3Cols}
@@ -1038,9 +1294,13 @@ const ExpenseGroup = memo(function ExpenseGroup({
               index={index}
               category={category}
               showBudgetedCol={showBudgetedCol}
-              editing={editing}
-              onEditingBudget={onEditingCategoryBudget}
               editMode={editMode}
+              isEditing={isEditingCategory}
+              onEdit={onEditCategory}
+              isEditingBudget={isEditingCategoryBudget}
+              onEditBudget={onEditCategoryBudget}
+              isBudgetActionMenuOpen={isBudgetActionMenuOpen}
+              onOpenBudgetActionMenu={onOpenBudgetActionMenu}
               // gestures={gestures}
               month={month}
               onSave={onSaveCategory}
@@ -1063,6 +1323,11 @@ function IncomeGroup({
   onSaveCategory,
   onDeleteCategory,
   showHiddenCategories,
+  editMode,
+  editingGroupId,
+  onEditGroup,
+  editingCategoryId,
+  onEditCategory,
 }) {
   return (
     <View>
@@ -1091,14 +1356,15 @@ function IncomeGroup({
               ? reportBudget.groupSumAmount(group.id)
               : rolloverBudget.groupSumAmount(group.id)
           }
-          nameTextStyle={{ fontWeight: '500', ...styles.underlinedText }}
-          amountTextStyle={{ fontWeight: '500' }}
           style={{
             backgroundColor: theme.altTableBackground,
           }}
           onAddCategory={onAddCategory}
           onSave={onSave}
           onDelete={onDelete}
+          editMode={editMode}
+          isEditing={editingGroupId === group.id}
+          onEdit={onEditGroup}
         />
 
         {group.categories
@@ -1122,6 +1388,9 @@ function IncomeGroup({
                 index={index}
                 onSave={onSaveCategory}
                 onDelete={onDeleteCategory}
+                editMode={editMode}
+                isEditing={editingCategoryId === category.id}
+                onEdit={onEditCategory}
               />
             );
           })}
@@ -1133,8 +1402,14 @@ function IncomeGroup({
 function BudgetGroups({
   type,
   categoryGroups,
-  editingId,
-  onEditingCategoryBudget,
+  editingGroupId,
+  onEditGroup,
+  editingCategoryId,
+  onEditCategory,
+  editingBudgetCategoryId,
+  onEditCategoryBudget,
+  openBudgetActionMenuId,
+  onOpenBudgetActionMenu,
   editMode,
   gestures,
   month,
@@ -1172,12 +1447,18 @@ function BudgetGroups({
             <ExpenseGroup
               key={group.id}
               group={group}
-              editingId={editingId}
               showBudgetedCol={showBudgetedCol}
-              editMode={editMode}
               gestures={gestures}
               month={month}
-              onEditingCategoryBudget={onEditingCategoryBudget}
+              editMode={editMode}
+              editingGroupId={editingGroupId}
+              onEditGroup={onEditGroup}
+              editingCategoryId={editingCategoryId}
+              onEditCategory={onEditCategory}
+              editingBudgetCategoryId={editingBudgetCategoryId}
+              onEditCategoryBudget={onEditCategoryBudget}
+              openBudgetActionMenuId={openBudgetActionMenuId}
+              onOpenBudgetActionMenu={onOpenBudgetActionMenu}
               onSaveCategory={onSaveCategory}
               onDeleteCategory={onDeleteCategory}
               onAddCategory={onAddCategory}
@@ -1213,6 +1494,11 @@ function BudgetGroups({
           onSaveCategory={onSaveCategory}
           onDeleteCategory={onDeleteCategory}
           showHiddenCategories={showHiddenCategories}
+          editMode={editMode}
+          editingGroupId={editingGroupId}
+          onEditGroup={onEditGroup}
+          editingCategoryId={editingCategoryId}
+          onEditCategory={onEditCategory}
         />
       )}
     </View>
@@ -1220,12 +1506,6 @@ function BudgetGroups({
 }
 
 export function BudgetTable(props) {
-  const [editingCategoryBudgetId, setEditingCategoryBudget] = useState(null);
-  function onEditingCategoryBudget(id) {
-    setEditingCategoryBudget(id);
-  }
-  const { width } = useResponsive();
-  const show3Cols = width >= 360;
   const {
     type,
     categoryGroups,
@@ -1245,11 +1525,62 @@ export function BudgetTable(props) {
     onReorderCategory,
     onReorderGroup,
     onShowBudgetDetails,
-    onOpenActionSheet,
+    // onOpenActionSheet,
     onBudgetAction,
+    onRefresh,
     savePrefs,
   } = props;
 
+  const GROUP_EDIT_ACTION = 'group';
+  const [editingGroupId, setEditingGroupId] = useState(null);
+  function onEditGroup(id) {
+    onEdit(GROUP_EDIT_ACTION, id);
+  }
+
+  const CATEGORY_EDIT_ACTION = 'category';
+  const [editingCategoryId, setEditingCategoryId] = useState(null);
+  function onEditCategory(id) {
+    onEdit(CATEGORY_EDIT_ACTION, id);
+  }
+
+  const CATEGORY_BUDGET_EDIT_ACTION = 'category-budget';
+  const [editingBudgetCategoryId, setEditingBudgetCategoryId] = useState(null);
+  function onEditCategoryBudget(id) {
+    onEdit(CATEGORY_BUDGET_EDIT_ACTION, id);
+  }
+
+  const BUDGET_MENU_OPEN_ACTION = 'budget-menu';
+  const [openBudgetActionMenuId, setOpenBudgetActionMenuId] = useState(null);
+  function onOpenBudgetActionMenu(id) {
+    onEdit(BUDGET_MENU_OPEN_ACTION, id);
+  }
+
+  function onEdit(action, id) {
+    // Do not allow editing if another field is currently being edited.
+    // Cancel the currently editing field in that case.
+    const currentlyEditing =
+      editingGroupId ||
+      editingCategoryId ||
+      editingBudgetCategoryId ||
+      openBudgetActionMenuId;
+
+    setEditingGroupId(
+      action === GROUP_EDIT_ACTION && !currentlyEditing ? id : null,
+    );
+    setEditingCategoryId(
+      action === CATEGORY_EDIT_ACTION && !currentlyEditing ? id : null,
+    );
+    setEditingBudgetCategoryId(
+      action === CATEGORY_BUDGET_EDIT_ACTION && !currentlyEditing ? id : null,
+    );
+    setOpenBudgetActionMenuId(
+      action === BUDGET_MENU_OPEN_ACTION && !currentlyEditing ? id : null,
+    );
+  }
+
+  const { width } = useResponsive();
+  const show3Cols = width >= 360;
+
   // let editMode = false; // neuter editMode -- sorry, not rewriting drag-n-drop right now
   let currentMonth = monthUtils.currentMonth();
   let format = useFormat();
@@ -1284,14 +1615,12 @@ export function BudgetTable(props) {
     <NamespaceContext.Provider value={monthUtils.sheetForMonth(month, type)}>
       <View style={{ flex: 1, overflowY: 'hidden' }} data-testid="budget-table">
         <BudgetHeader
-          show3Cols={show3Cols}
           currentMonth={month}
           toggleDisplay={toggleDisplay}
-          showBudgetedCol={showBudgetedCol}
           monthBounds={monthBounds}
           editMode={editMode}
-          onDone={() => onEditMode(false)}
-          onOpenActionSheet={onOpenActionSheet}
+          onEditMode={onEditMode}
+          // onOpenActionSheet={onOpenActionSheet}
           onPrevMonth={onPrevMonth}
           onNextMonth={onNextMonth}
           showHiddenCategories={showHiddenCategories}
@@ -1317,25 +1646,29 @@ export function BudgetTable(props) {
             />
           )}
           <View style={{ flex: 1 }} />
-          <Button
-            type="bare"
-            disabled={show3Cols}
-            onClick={toggleDisplay}
-            style={{
-              ...buttonStyle,
-              padding: '0 8px',
-              margin: '0 -8px',
-              background:
-                showBudgetedCol && !show3Cols
-                  ? `linear-gradient(-45deg, ${theme.formInputBackgroundSelection} 8px, transparent 0)`
-                  : !show3Cols
-                  ? `linear-gradient(45deg, ${theme.formInputBackgroundSelection} 8px, transparent 0)`
-                  : null,
-              // 45deg to flip it to the lower left corner
-            }}
-          >
-            {show3Cols || showBudgetedCol ? (
-              <View style={{ width: 90, justifyContent: 'center' }}>
+          {(show3Cols || showBudgetedCol) && (
+            <Button
+              type="bare"
+              disabled={show3Cols}
+              onClick={toggleDisplay}
+              style={{
+                ...buttonStyle,
+                padding: '0 8px',
+                margin: '0 -8px',
+                background:
+                  showBudgetedCol && !show3Cols
+                    ? `linear-gradient(-45deg, ${theme.formInputBackgroundSelection} 8px, transparent 0)`
+                    : null,
+              }}
+            >
+              <View
+                style={{
+                  flexBasis: 90,
+                  width: 90,
+                  justifyContent: 'center',
+                  alignItems: 'flex-end',
+                }}
+              >
                 <Label
                   title="BUDGETED"
                   style={{ color: theme.buttonNormalText }}
@@ -1354,12 +1687,26 @@ export function BudgetTable(props) {
                   }}
                 />
               </View>
-            ) : null}
-            {show3Cols || !showBudgetedCol ? (
+            </Button>
+          )}
+          {(show3Cols || !showBudgetedCol) && (
+            <Button
+              type="bare"
+              disabled={show3Cols}
+              onClick={toggleDisplay}
+              style={{
+                ...buttonStyle,
+                background:
+                  !showBudgetedCol && !show3Cols
+                    ? `linear-gradient(45deg, ${theme.formInputBackgroundSelection} 8px, transparent 0)`
+                    : null,
+              }}
+            >
               <View
                 style={{
                   width: 90,
                   justifyContent: 'center',
+                  alignItems: 'flex-end',
                 }}
               >
                 <Label title="SPENT" style={{ color: theme.formInputText }} />
@@ -1374,12 +1721,13 @@ export function BudgetTable(props) {
                   }}
                 />
               </View>
-            ) : null}
-          </Button>
+            </Button>
+          )}
           <View
             style={{
               width: 90,
               justifyContent: 'center',
+              alignItems: 'flex-end',
             }}
           >
             <Label title="BALANCE" style={{ color: theme.formInputText }} />
@@ -1396,73 +1744,85 @@ export function BudgetTable(props) {
           </View>
         </View>
         <View style={{ overflowY: 'auto' }}>
-          {!editMode ? (
-            // <ScrollView
-            //   ref={el => (this.list = el)}
-            //   keyboardShouldPersistTaps="always"
-            //   refreshControl={refreshControl}
-            //   style={{ backgroundColor: colors.n10 }}
-            //   automaticallyAdjustContentInsets={false}
-            // >
-            <View>
-              <BudgetGroups
-                type={type}
-                categoryGroups={categoryGroups}
-                editingId={editingCategoryBudgetId}
-                editMode={editMode}
-                showBudgetedCol={showBudgetedCol}
-                show3Cols={show3Cols}
-                showHiddenCategories={showHiddenCategories}
-                // gestures={gestures}
-                month={month}
-                onEditingCategoryBudget={onEditingCategoryBudget}
-                onSaveCategory={onSaveCategory}
-                onDeleteCategory={onDeleteCategory}
-                onAddCategory={onAddCategory}
-                onAddGroup={onAddGroup}
-                onSaveGroup={onSaveGroup}
-                onDeleteGroup={onDeleteGroup}
-                onReorderCategory={onReorderCategory}
-                onReorderGroup={onReorderGroup}
-                onBudgetAction={onBudgetAction}
-              />
-            </View>
-          ) : (
-            // </ScrollView>
-            // <DragDrop>
-            //   {({
-            //     dragging,
-            //     onGestureEvent,
-            //     onHandlerStateChange,
-            //     scrollRef,
-            //     onScroll
-            //   }) => (
-            <View>
-              <BudgetGroups
-                type={type}
-                categoryGroups={categoryGroups}
-                showBudgetedCol={showBudgetedCol}
-                show3Cols={show3Cols}
-                showHiddenCategories={showHiddenCategories}
-                editingId={editingCategoryBudgetId}
-                editMode={editMode}
-                // gestures={gestures}
-                onEditingCategoryBudget={onEditingCategoryBudget}
-                onSaveCategory={onSaveCategory}
-                onDeleteCategory={onDeleteCategory}
-                onAddCategory={onAddCategory}
-                onAddGroup={onAddGroup}
-                onSaveGroup={onSaveGroup}
-                onDeleteGroup={onDeleteGroup}
-                onReorderCategory={onReorderCategory}
-                onReorderGroup={onReorderGroup}
-                onBudgetAction={onBudgetAction}
-              />
-            </View>
+          <PullToRefresh onRefresh={onRefresh}>
+            {!editMode ? (
+              // <ScrollView
+              //   ref={el => (this.list = el)}
+              //   keyboardShouldPersistTaps="always"
+              //   refreshControl={refreshControl}
+              //   style={{ backgroundColor: colors.n10 }}
+              //   automaticallyAdjustContentInsets={false}
+              // >
+              <View>
+                <BudgetGroups
+                  type={type}
+                  categoryGroups={categoryGroups}
+                  showBudgetedCol={showBudgetedCol}
+                  show3Cols={show3Cols}
+                  showHiddenCategories={showHiddenCategories}
+                  // gestures={gestures}
+                  month={month}
+                  editMode={editMode}
+                  editingGroupId={editingGroupId}
+                  onEditGroup={onEditGroup}
+                  editingCategoryId={editingCategoryId}
+                  onEditCategory={onEditCategory}
+                  editingBudgetCategoryId={editingBudgetCategoryId}
+                  onEditCategoryBudget={onEditCategoryBudget}
+                  openBudgetActionMenuId={openBudgetActionMenuId}
+                  onOpenBudgetActionMenu={onOpenBudgetActionMenu}
+                  onSaveCategory={onSaveCategory}
+                  onDeleteCategory={onDeleteCategory}
+                  onAddCategory={onAddCategory}
+                  onAddGroup={onAddGroup}
+                  onSaveGroup={onSaveGroup}
+                  onDeleteGroup={onDeleteGroup}
+                  onReorderCategory={onReorderCategory}
+                  onReorderGroup={onReorderGroup}
+                  onBudgetAction={onBudgetAction}
+                />
+              </View>
+            ) : (
+              // </ScrollView>
+              // <DragDrop>
+              //   {({
+              //     dragging,
+              //     onGestureEvent,
+              //     onHandlerStateChange,
+              //     scrollRef,
+              //     onScroll
+              //   }) => (
+              <View>
+                <BudgetGroups
+                  type={type}
+                  categoryGroups={categoryGroups}
+                  showBudgetedCol={showBudgetedCol}
+                  show3Cols={show3Cols}
+                  showHiddenCategories={showHiddenCategories}
+                  // gestures={gestures}
+                  editMode={editMode}
+                  editingGroupId={editingGroupId}
+                  onEditGroup={onEditGroup}
+                  editingCategoryId={editingCategoryId}
+                  onEditCategory={onEditCategory}
+                  editingBudgetCategoryId={editingBudgetCategoryId}
+                  onEditCategoryBudget={onEditCategoryBudget}
+                  onSaveCategory={onSaveCategory}
+                  onDeleteCategory={onDeleteCategory}
+                  onAddCategory={onAddCategory}
+                  onAddGroup={onAddGroup}
+                  onSaveGroup={onSaveGroup}
+                  onDeleteGroup={onDeleteGroup}
+                  onReorderCategory={onReorderCategory}
+                  onReorderGroup={onReorderGroup}
+                  onBudgetAction={onBudgetAction}
+                />
+              </View>
 
-            // <DragDropHighlight />
-            // </DragDrop>
-          )}
+              // <DragDropHighlight />
+              // </DragDrop>
+            )}
+          </PullToRefresh>
         </View>
       </View>
     </NamespaceContext.Provider>
@@ -1476,6 +1836,8 @@ function BudgetHeader({
   monthBounds,
   onPrevMonth,
   onNextMonth,
+  editMode,
+  onEditMode,
   showHiddenCategories,
   savePrefs,
 }) {
@@ -1501,7 +1863,10 @@ function BudgetHeader({
   let onMenuSelect = name => {
     tooltip.close();
     switch (name) {
-      case 'toggle-hidden':
+      case 'edit-mode':
+        onEditMode?.(true);
+        break;
+      case 'toggle-hidden-categories':
         toggleHiddenCategories();
         break;
       default:
@@ -1591,36 +1956,58 @@ function BudgetHeader({
           flexDirection: 'row',
         }}
       >
-        <Button
-          type="bare"
-          style={{
-            backgroundColor: 'transparent',
-            paddingLeft: 12,
-            paddingRight: 12,
-          }}
-          {...tooltip.getOpenEvents()}
-        >
-          {tooltip.isOpen && (
-            <Tooltip
-              position="bottom-right"
-              width={200}
-              style={{ padding: 0 }}
-              onClose={tooltip.close}
+        {!editMode ? (
+          <>
+            <Button
+              type="bare"
+              style={{
+                backgroundColor: 'transparent',
+                paddingLeft: 12,
+                paddingRight: 12,
+              }}
+              {...tooltip.getOpenEvents()}
             >
-              <Menu
-                onMenuSelect={onMenuSelect}
-                items={[
-                  { name: 'toggle-hidden', text: 'Toggle hidden categories' },
-                ]}
+              <DotsHorizontalTriple
+                width="20"
+                height="20"
+                style={{ color: 'white' }}
               />
-            </Tooltip>
-          )}
-          <DotsHorizontalTriple
-            width="20"
-            height="20"
-            style={{ color: 'white' }}
-          />
-        </Button>
+            </Button>
+            {tooltip.isOpen && (
+              <Tooltip
+                position="bottom-right"
+                width={200}
+                style={{ padding: 0 }}
+                onClose={tooltip.close}
+              >
+                <Menu
+                  onMenuSelect={onMenuSelect}
+                  items={[
+                    { name: 'edit-mode', text: 'Edit mode' },
+                    {
+                      name: 'toggle-hidden-categories',
+                      text: 'Toggle hidden categories',
+                    },
+                  ]}
+                />
+              </Tooltip>
+            )}
+          </>
+        ) : (
+          <Button
+            type="bare"
+            style={{
+              backgroundColor: 'transparent',
+              paddingLeft: 12,
+              paddingRight: 12,
+              ...styles.mediumText,
+              color: 'white',
+            }}
+            onClick={() => onEditMode?.(false)}
+          >
+            Done
+          </Button>
+        )}
       </View>
     </View>
   );
diff --git a/packages/desktop-client/src/components/budget/index.js b/packages/desktop-client/src/components/budget/index.tsx
similarity index 84%
rename from packages/desktop-client/src/components/budget/index.js
rename to packages/desktop-client/src/components/budget/index.tsx
index 65f984d2a08..dbc3f1bf594 100644
--- a/packages/desktop-client/src/components/budget/index.js
+++ b/packages/desktop-client/src/components/budget/index.tsx
@@ -7,29 +7,37 @@ import React, {
   useRef,
 } from 'react';
 import { useSelector } from 'react-redux';
-import { useLocation, useMatch } from 'react-router-dom';
+import {
+  type NavigateFunction,
+  type PathMatch,
+  useLocation,
+  useMatch,
+} from 'react-router-dom';
 
 import { useSpreadsheet } from 'loot-core/src/client/SpreadsheetProvider';
+import { type QueriesState } from 'loot-core/src/client/state-types/queries';
 import { send, listen } from 'loot-core/src/platform/client/fetch';
 import {
   addCategory,
-  updateCategory,
   moveCategory,
   moveCategoryGroup,
+  updateCategory,
   deleteCategory,
   addGroup,
   updateGroup,
   deleteGroup,
 } from 'loot-core/src/shared/categories';
 import * as monthUtils from 'loot-core/src/shared/months';
+import { type Handlers } from 'loot-core/src/types/handlers';
+import { type GlobalPrefs, type LocalPrefs } from 'loot-core/src/types/prefs';
 
-import { useActions } from '../../hooks/useActions';
+import { type BoundActions, useActions } from '../../hooks/useActions';
 import useCategories from '../../hooks/useCategories';
 import useFeatureFlag from '../../hooks/useFeatureFlag';
 import useNavigate from '../../hooks/useNavigate';
 import { styles } from '../../style';
 import View from '../common/View';
-import { TitlebarContext } from '../Titlebar';
+import { TitlebarContext, type TitlebarContextValue } from '../Titlebar';
 
 import DynamicBudgetTable from './DynamicBudgetTable';
 import { getValidMonthBounds } from './MonthsContext';
@@ -38,7 +46,56 @@ import { ReportProvider } from './report/ReportContext';
 import * as rollover from './rollover/rollover-components';
 import { RolloverContext } from './rollover/RolloverContext';
 
-function Budget(props) {
+type ReportComponents = {
+  SummaryComponent: typeof report.BudgetSummary;
+  ExpenseCategoryComponent: typeof report.ExpenseCategoryMonth;
+  ExpenseGroupComponent: typeof report.ExpenseGroupMonth;
+  IncomeCategoryComponent: typeof report.IncomeCategoryMonth;
+  IncomeGroupComponent: typeof report.IncomeGroupMonth;
+  BudgetTotalsComponent: typeof report.BudgetTotalsMonth;
+  IncomeHeaderComponent: typeof report.IncomeHeaderMonth;
+};
+
+type RolloverComponents = {
+  SummaryComponent: typeof RolloverBudgetSummary;
+  ExpenseCategoryComponent: typeof rollover.ExpenseCategoryMonth;
+  ExpenseGroupComponent: typeof rollover.ExpenseGroupMonth;
+  IncomeCategoryComponent: typeof rollover.IncomeCategoryMonth;
+  IncomeGroupComponent: typeof rollover.IncomeGroupMonth;
+  BudgetTotalsComponent: typeof rollover.BudgetTotalsMonth;
+  IncomeHeaderComponent: typeof rollover.IncomeHeaderMonth;
+};
+
+type BudgetProps = {
+  accountId?: string;
+  startMonth: LocalPrefs['budget.startMonth'];
+  collapsedPrefs: LocalPrefs['budget.collapsed'];
+  summaryCollapsed: LocalPrefs['budget.summaryCollapsed'];
+  budgetType: LocalPrefs['budgetType'];
+  maxMonths: GlobalPrefs['maxMonths'];
+  categoryGroups: QueriesState['categories']['grouped'];
+  reportComponents: ReportComponents;
+  rolloverComponents: RolloverComponents;
+  titlebar: TitlebarContextValue;
+  match: PathMatch<string>;
+  spreadsheet: ReturnType<typeof useSpreadsheet>;
+  navigate: NavigateFunction;
+  getCategories: BoundActions['getCategories'];
+  savePrefs: BoundActions['savePrefs'];
+  createCategory: BoundActions['createCategory'];
+  updateCategory: BoundActions['updateCategory'];
+  pushModal: BoundActions['pushModal'];
+  deleteCategory: BoundActions['deleteCategory'];
+  createGroup: BoundActions['createGroup'];
+  updateGroup: BoundActions['updateGroup'];
+  deleteGroup: BoundActions['deleteGroup'];
+  applyBudgetAction: BoundActions['applyBudgetAction'];
+  moveCategory: BoundActions['moveCategory'];
+  moveCategoryGroup: BoundActions['moveCategoryGroup'];
+  loadPrefs: BoundActions['loadPrefs'];
+};
+
+function Budget(props: BudgetProps) {
   const currentMonth = monthUtils.currentMonth();
   const tableRef = useRef(null);
 
@@ -130,7 +187,7 @@ function Budget(props) {
   const prewarmMonth = async (month, type = null) => {
     type = type || props.budgetType;
 
-    let method =
+    let method: keyof Handlers =
       type === 'report' ? 'report-budget-month' : 'rollover-budget-month';
 
     let values = await send(method, { month });
@@ -439,7 +496,7 @@ function Budget(props) {
   return <View style={{ flex: 1 }}>{table}</View>;
 }
 
-const RolloverBudgetSummary = memo(props => {
+const RolloverBudgetSummary = memo<{ month: string }>(props => {
   const isGoalTemplatesEnabled = useFeatureFlag('goalTemplatesEnabled');
   return (
     <rollover.BudgetSummary
@@ -470,7 +527,7 @@ export default function BudgetWrapper(props) {
   let match = useMatch(location.pathname);
   let navigate = useNavigate();
 
-  let reportComponents = useMemo(
+  let reportComponents = useMemo<ReportComponents>(
     () => ({
       SummaryComponent: report.BudgetSummary,
       ExpenseCategoryComponent: report.ExpenseCategoryMonth,
@@ -483,7 +540,7 @@ export default function BudgetWrapper(props) {
     [report],
   );
 
-  let rolloverComponents = useMemo(
+  let rolloverComponents = useMemo<RolloverComponents>(
     () => ({
       SummaryComponent: RolloverBudgetSummary,
       ExpenseCategoryComponent: rollover.ExpenseCategoryMonth,
diff --git a/packages/desktop-client/src/components/budget/report/components.tsx b/packages/desktop-client/src/components/budget/report/components.tsx
index 8255a06d43e..6dfe0c1d90e 100644
--- a/packages/desktop-client/src/components/budget/report/components.tsx
+++ b/packages/desktop-client/src/components/budget/report/components.tsx
@@ -360,6 +360,7 @@ export const CategoryMonth = memo(function CategoryMonth({
       {!category.is_income && (
         <Field
           name="balance"
+          truncate={false}
           width="flex"
           style={{ paddingRight: styles.monthRightPadding, textAlign: 'right' }}
         >
diff --git a/packages/desktop-client/src/components/budget/rollover/BalanceTooltip.tsx b/packages/desktop-client/src/components/budget/rollover/BalanceTooltip.tsx
new file mode 100644
index 00000000000..cf959c9a945
--- /dev/null
+++ b/packages/desktop-client/src/components/budget/rollover/BalanceTooltip.tsx
@@ -0,0 +1,106 @@
+import React, { useState } from 'react';
+
+import { rolloverBudget } from 'loot-core/src/client/queries';
+
+import Menu from '../../common/Menu';
+import useSheetValue from '../../spreadsheet/useSheetValue';
+import { Tooltip } from '../../tooltips';
+
+import CoverTooltip from './CoverTooltip';
+import TransferTooltip from './TransferTooltip';
+
+type BalanceTooltipProps = {
+  categoryId: string;
+  tooltip: { close: () => void };
+  monthIndex: number;
+  onBudgetAction: (idx: number, action: string, arg?: unknown) => void;
+  onClose?: () => void;
+};
+export default function BalanceTooltip({
+  categoryId,
+  tooltip,
+  monthIndex,
+  onBudgetAction,
+  onClose,
+  ...tooltipProps
+}: BalanceTooltipProps) {
+  let carryover = useSheetValue(rolloverBudget.catCarryover(categoryId));
+  let balance = useSheetValue(rolloverBudget.catBalance(categoryId));
+  let [menu, setMenu] = useState('menu');
+
+  let _onClose = () => {
+    tooltip.close();
+    onClose?.();
+  };
+
+  return (
+    <>
+      {menu === 'menu' && (
+        <Tooltip
+          position="bottom-right"
+          width={200}
+          style={{ padding: 0 }}
+          onClose={_onClose}
+          {...tooltipProps}
+        >
+          <Menu
+            onMenuSelect={type => {
+              if (type === 'carryover') {
+                onBudgetAction(monthIndex, 'carryover', {
+                  category: categoryId,
+                  flag: !carryover,
+                });
+                _onClose();
+              } else {
+                setMenu(type);
+              }
+            }}
+            items={[
+              {
+                name: 'transfer',
+                text: 'Transfer to another category',
+              },
+              {
+                name: 'carryover',
+                text: carryover
+                  ? 'Remove overspending rollover'
+                  : 'Rollover overspending',
+              },
+              balance < 0 && {
+                name: 'cover',
+                text: 'Cover overspending',
+              },
+            ].filter(x => x)}
+          />
+        </Tooltip>
+      )}
+
+      {menu === 'transfer' && (
+        <TransferTooltip
+          initialAmountName={rolloverBudget.catBalance(categoryId)}
+          showToBeBudgeted={true}
+          onClose={_onClose}
+          onSubmit={(amount, toCategory) => {
+            onBudgetAction(monthIndex, 'transfer-category', {
+              amount,
+              from: categoryId,
+              to: toCategory,
+            });
+          }}
+        />
+      )}
+
+      {menu === 'cover' && (
+        <CoverTooltip
+          onClose={_onClose}
+          onSubmit={fromCategory => {
+            onBudgetAction(monthIndex, 'cover', {
+              to: categoryId,
+              from: fromCategory,
+            });
+          }}
+        />
+      )}
+    </>
+  );
+}
diff --git a/packages/desktop-client/src/components/budget/rollover/CoverTooltip.tsx b/packages/desktop-client/src/components/budget/rollover/CoverTooltip.tsx
new file mode 100644
index 00000000000..9e24fcaf682
--- /dev/null
+++ b/packages/desktop-client/src/components/budget/rollover/CoverTooltip.tsx
@@ -0,0 +1,83 @@
+import React, { type ComponentProps, useState } from 'react';
+
+import useCategories from '../../../hooks/useCategories';
+import CategoryAutocomplete from '../../autocomplete/CategoryAutocomplete';
+import Button from '../../common/Button';
+import InitialFocus from '../../common/InitialFocus';
+import View from '../../common/View';
+import { Tooltip } from '../../tooltips';
+import { addToBeBudgetedGroup } from '../util';
+
+type CoverTooltipProps = {
+  tooltipProps?: ComponentProps<typeof Tooltip>;
+  onSubmit: (category: unknown) => void;
+  onClose: () => void;
+};
+export default function CoverTooltip({
+  tooltipProps,
+  onSubmit,
+  onClose,
+}: CoverTooltipProps) {
+  let { grouped: categoryGroups } = useCategories();
+  categoryGroups = addToBeBudgetedGroup(
+    categoryGroups.filter(g => !g.is_income),
+  );
+  let [category, setCategory] = useState(null);
+
+  function submit() {
+    if (category) {
+      onSubmit(category);
+      onClose();
+    }
+  }
+
+  return (
+    <Tooltip
+      position="bottom-right"
+      width={200}
+      style={{ padding: 10 }}
+      {...tooltipProps}
+      onClose={onClose}
+    >
+      <View style={{ marginBottom: 5 }}>Cover from category:</View>
+
+      <InitialFocus>
+        {node => (
+          <CategoryAutocomplete
+            categoryGroups={categoryGroups}
+            value={null}
+            openOnFocus={true}
+            onUpdate={id => {}}
+            onSelect={id => setCategory(id)}
+            inputProps={{
+              inputRef: node,
+              onKeyDown: e => {
+                if (e.key === 'Enter') {
+                  submit();
+                }
+              },
+            }}
+          />
+        )}
+      </InitialFocus>
+
+      <View
+        style={{
+          alignItems: 'flex-end',
+          marginTop: 10,
+        }}
+      >
+        <Button
+          type="primary"
+          style={{
+            fontSize: 12,
+            paddingTop: 3,
+          }}
+          onClick={submit}
+        >
+          Transfer
+        </Button>
+      </View>
+    </Tooltip>
+  );
+}
diff --git a/packages/desktop-client/src/components/budget/rollover/HoldTooltip.tsx b/packages/desktop-client/src/components/budget/rollover/HoldTooltip.tsx
index 74e1228080f..0399184d59d 100644
--- a/packages/desktop-client/src/components/budget/rollover/HoldTooltip.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/HoldTooltip.tsx
@@ -29,7 +29,7 @@ export default function HoldTooltip({ onSubmit, onClose }: HoldTooltipProps) {
   useEffect(() => {
     (async () => {
       const node = await spreadsheet.get(sheetName, 'to-budget');
-      setAmount(integerToCurrency(Math.max(node.value, 0)));
+      setAmount(integerToCurrency(Math.max(node.value as number, 0)));
     })();
   }, []);
 
diff --git a/packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx b/packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx
index bdf02fef1fe..76a4d3b83e7 100644
--- a/packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx
@@ -9,6 +9,7 @@ import { useSpreadsheet } from 'loot-core/src/client/SpreadsheetProvider';
 import evalArithmetic from 'loot-core/src/shared/arithmetic';
 import { integerToCurrency, amountToInteger } from 'loot-core/src/shared/util';
 
+import useCategories from '../../../hooks/useCategories';
 import CategoryAutocomplete from '../../autocomplete/CategoryAutocomplete';
 import Button from '../../common/Button';
 import InitialFocus from '../../common/InitialFocus';
@@ -16,7 +17,6 @@ import Input from '../../common/Input';
 import View from '../../common/View';
 import NamespaceContext from '../../spreadsheet/NamespaceContext';
 import { Tooltip } from '../../tooltips';
-import { CategoryGroupsContext } from '../CategoryGroupsContext';
 import { addToBeBudgetedGroup } from '../util';
 
 type TransferTooltipProps = {
@@ -37,7 +37,7 @@ export default function TransferTooltip({
 }: TransferTooltipProps) {
   let spreadsheet = useSpreadsheet();
   let sheetName = useContext(NamespaceContext);
-  let categoryGroups = useContext(CategoryGroupsContext);
+  let { grouped: categoryGroups } = useCategories();
 
   categoryGroups = categoryGroups.filter(g => !g.is_income);
   if (showToBeBudgeted) {
@@ -51,7 +51,7 @@ export default function TransferTooltip({
     (async () => {
       if (initialAmountName) {
         const node = await spreadsheet.get(sheetName, initialAmountName);
-        setAmount(integerToCurrency(Math.max(node.value, 0)));
+        setAmount(integerToCurrency(Math.max(node.value as number, 0)));
       } else {
         setAmount(integerToCurrency(Math.max(initialAmount, 0)));
       }
diff --git a/packages/desktop-client/src/components/budget/rollover/rollover-components.tsx b/packages/desktop-client/src/components/budget/rollover/rollover-components.tsx
index ff0c26e3392..8d1f2c3610d 100644
--- a/packages/desktop-client/src/components/budget/rollover/rollover-components.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/rollover-components.tsx
@@ -1,4 +1,4 @@
-import React, { type ComponentProps, memo, useContext, useState } from 'react';
+import React, { memo, useState } from 'react';
 
 import { rolloverBudget } from 'loot-core/src/client/queries';
 import evalArithmetic from 'loot-core/src/shared/arithmetic';
@@ -7,181 +7,21 @@ import { integerToCurrency, amountToInteger } from 'loot-core/src/shared/util';
 import useFeatureFlag from '../../../hooks/useFeatureFlag';
 import CheveronDown from '../../../icons/v1/CheveronDown';
 import { styles, theme, type CSSProperties } from '../../../style';
-import CategoryAutocomplete from '../../autocomplete/CategoryAutocomplete';
 import Button from '../../common/Button';
-import InitialFocus from '../../common/InitialFocus';
 import Menu from '../../common/Menu';
 import Text from '../../common/Text';
 import View from '../../common/View';
 import CellValue from '../../spreadsheet/CellValue';
 import useFormat from '../../spreadsheet/useFormat';
-import useSheetValue from '../../spreadsheet/useSheetValue';
 import { Row, Field, SheetCell } from '../../table';
 import { Tooltip, useTooltip } from '../../tooltips';
 import BalanceWithCarryover from '../BalanceWithCarryover';
-import { CategoryGroupsContext } from '../CategoryGroupsContext';
-import { makeAmountGrey, addToBeBudgetedGroup } from '../util';
+import { makeAmountGrey } from '../util';
 
-import TransferTooltip from './TransferTooltip';
+import BalanceTooltip from './BalanceTooltip';
 
 export { BudgetSummary } from './BudgetSummary';
 
-type CoverTooltipProps = {
-  tooltipProps?: ComponentProps<typeof Tooltip>;
-  onSubmit: (category: unknown) => void;
-  onClose: () => void;
-};
-function CoverTooltip({ tooltipProps, onSubmit, onClose }: CoverTooltipProps) {
-  let categoryGroups = useContext(CategoryGroupsContext);
-  categoryGroups = addToBeBudgetedGroup(
-    categoryGroups.filter(g => !g.is_income),
-  );
-  let [category, setCategory] = useState(null);
-
-  function submit() {
-    if (category) {
-      onSubmit(category);
-      onClose();
-    }
-  }
-
-  return (
-    <Tooltip
-      position="bottom-right"
-      width={200}
-      style={{ padding: 10 }}
-      {...tooltipProps}
-      onClose={onClose}
-    >
-      <View style={{ marginBottom: 5 }}>Cover from category:</View>
-
-      <InitialFocus>
-        {node => (
-          <CategoryAutocomplete
-            categoryGroups={categoryGroups}
-            value={null}
-            openOnFocus={true}
-            onUpdate={id => {}}
-            onSelect={id => setCategory(id)}
-            inputProps={{
-              inputRef: node,
-              onKeyDown: e => {
-                if (e.key === 'Enter') {
-                  submit();
-                }
-              },
-            }}
-          />
-        )}
-      </InitialFocus>
-
-      <View
-        style={{
-          alignItems: 'flex-end',
-          marginTop: 10,
-        }}
-      >
-        <Button
-          type="primary"
-          style={{
-            fontSize: 12,
-            paddingTop: 3,
-          }}
-          onClick={submit}
-        >
-          Transfer
-        </Button>
-      </View>
-    </Tooltip>
-  );
-}
-
-type BalanceTooltipProps = {
-  categoryId: string;
-  tooltip: { close: () => void };
-  monthIndex: number;
-  onBudgetAction: (idx: number, action: string, arg?: unknown) => void;
-};
-function BalanceTooltip({
-  categoryId,
-  tooltip,
-  monthIndex,
-  onBudgetAction,
-}: BalanceTooltipProps) {
-  let carryover = useSheetValue(rolloverBudget.catCarryover(categoryId));
-  let balance = useSheetValue(rolloverBudget.catBalance(categoryId));
-  let [menu, setMenu] = useState('menu');
-
-  return (
-    <>
-      {menu === 'menu' && (
-        <Tooltip
-          position="bottom-right"
-          width={200}
-          style={{ padding: 0 }}
-          onClose={tooltip.close}
-        >
-          <Menu
-            onMenuSelect={type => {
-              if (type === 'carryover') {
-                onBudgetAction(monthIndex, 'carryover', {
-                  category: categoryId,
-                  flag: !carryover,
-                });
-                tooltip.close();
-              } else {
-                setMenu(type);
-              }
-            }}
-            items={[
-              {
-                name: 'transfer',
-                text: 'Transfer to another category',
-              },
-              {
-                name: 'carryover',
-                text: carryover
-                  ? 'Remove overspending rollover'
-                  : 'Rollover overspending',
-              },
-              balance < 0 && {
-                name: 'cover',
-                text: 'Cover overspending',
-              },
-            ].filter(x => x)}
-          />
-        </Tooltip>
-      )}
-
-      {menu === 'transfer' && (
-        <TransferTooltip
-          initialAmountName={rolloverBudget.catBalance(categoryId)}
-          showToBeBudgeted={true}
-          onClose={tooltip.close}
-          onSubmit={(amount, toCategory) => {
-            onBudgetAction(monthIndex, 'transfer-category', {
-              amount,
-              from: categoryId,
-              to: toCategory,
-            });
-          }}
-        />
-      )}
-
-      {menu === 'cover' && (
-        <CoverTooltip
-          onClose={tooltip.close}
-          onSubmit={fromCategory => {
-            onBudgetAction(monthIndex, 'cover', {
-              to: categoryId,
-              from: fromCategory,
-            });
-          }}
-        />
-      )}
-    </>
-  );
-}
 let headerLabelStyle: CSSProperties = {
   flex: 1,
   padding: '0 5px',
@@ -347,9 +187,10 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({
           <View
             style={{
               flexShrink: 1,
-              marginRight: 0,
-              marginLeft: 3,
+              paddingLeft: 3,
               justifyContent: 'center',
+              borderTopWidth: 1,
+              borderColor: theme.tableBorder,
             }}
           >
             <Button
@@ -471,6 +312,7 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({
       </Field>
       <Field
         name="balance"
+        truncate={false}
         width="flex"
         style={{ paddingRight: styles.monthRightPadding, textAlign: 'right' }}
       >
diff --git a/packages/desktop-client/src/components/budget/util.ts b/packages/desktop-client/src/components/budget/util.ts
index f8c4af733a1..bda8e59e227 100644
--- a/packages/desktop-client/src/components/budget/util.ts
+++ b/packages/desktop-client/src/components/budget/util.ts
@@ -8,7 +8,17 @@ export function addToBeBudgetedGroup(groups: CategoryGroupEntity[]) {
     {
       id: 'to-be-budgeted',
       name: 'To Be Budgeted',
-      categories: [{ id: 'to-be-budgeted', name: 'To Be Budgeted' }],
+      categories: [
+        {
+          id: 'to-be-budgeted',
+          name: 'To Be Budgeted',
+          cat_group: 'to-be-budgeted',
+          group: {
+            id: 'to-be-budgeted',
+            name: 'To Be Budgeted',
+          },
+        },
+      ],
     },
     ...groups,
   ];
@@ -22,7 +32,7 @@ export function separateGroups(categoryGroups: CategoryGroupEntity[]) {
 }
 
 export function makeAmountGrey(value: number | string) {
-  return value === 0 || value === '0' || value === ''
+  return value === 0 || value === '0' || value === '' || value == null
     ? { color: theme.altMenuItemText }
     : null;
 }
diff --git a/packages/desktop-client/src/components/mobile/MobileForms.js b/packages/desktop-client/src/components/mobile/MobileForms.js
index 21ebbc657a3..66f5bd780f3 100644
--- a/packages/desktop-client/src/components/mobile/MobileForms.js
+++ b/packages/desktop-client/src/components/mobile/MobileForms.js
@@ -32,8 +32,8 @@ export function FieldLabel({ title, flush, style }) {
 const valueStyle = {
   borderWidth: 1,
   borderColor: theme.formInputBorder,
-  marginLeft: -1,
-  marginRight: -1,
+  marginLeft: 8,
+  marginRight: 8,
   height: FIELD_HEIGHT,
   paddingHorizontal: styles.mobileEditingPadding,
 };
diff --git a/packages/desktop-client/src/components/reports/CategorySelector.tsx b/packages/desktop-client/src/components/reports/CategorySelector.tsx
index 8dc2da84dab..d41a512722e 100644
--- a/packages/desktop-client/src/components/reports/CategorySelector.tsx
+++ b/packages/desktop-client/src/components/reports/CategorySelector.tsx
@@ -1,19 +1,20 @@
 import React, { Fragment, useState } from 'react';
 
+import {
+  type CategoryEntity,
+  type CategoryGroupEntity,
+} from 'loot-core/src/types/models';
+
 import Eye from '../../icons/v2/Eye';
 import EyeSlashed from '../../icons/v2/EyeSlashed';
-import {
-  type Category,
-  type CategoryGroup,
-  type CategoryListProps,
-} from '../autocomplete/CategoryAutocomplete';
+import { type CategoryListProps } from '../autocomplete/CategoryAutocomplete';
 import Button from '../common/Button';
 import { Checkbox } from '../forms';
 
 type CategorySelectorProps = {
-  categoryGroups: Array<CategoryGroup>;
+  categoryGroups: Array<CategoryGroupEntity>;
   selectedCategories: CategoryListProps['items'];
-  setSelectedCategories: (selectedCategories: Category[]) => null;
+  setSelectedCategories: (selectedCategories: CategoryEntity[]) => null;
 };
 
 export default function CategorySelector({
diff --git a/packages/desktop-client/src/components/settings/Encryption.tsx b/packages/desktop-client/src/components/settings/Encryption.tsx
index 23d6d7517db..6f062587c10 100644
--- a/packages/desktop-client/src/components/settings/Encryption.tsx
+++ b/packages/desktop-client/src/components/settings/Encryption.tsx
@@ -74,7 +74,10 @@ export default function EncryptionSettings() {
         <strong>End-to-end encryption</strong> is not available when running
         without a server. Budget files are always kept unencrypted locally, and
         encryption is only applied when sending data to a server.{' '}
-        <ExternalLink to="https://actualbudget.org/docs/getting-started/sync/#end-to-end-encryption">
+        <ExternalLink
+          to="https://actualbudget.org/docs/getting-started/sync/#end-to-end-encryption"
+          linkColor="purple"
+        >
           Learn more…
         </ExternalLink>
       </Text>
diff --git a/packages/desktop-client/src/components/settings/index.tsx b/packages/desktop-client/src/components/settings/index.tsx
index 28e667fa278..26985c78074 100644
--- a/packages/desktop-client/src/components/settings/index.tsx
+++ b/packages/desktop-client/src/components/settings/index.tsx
@@ -72,7 +72,10 @@ function About() {
           </Text>
         )}
         <Text>
-          <ExternalLink to="https://actualbudget.org/docs/releases">
+          <ExternalLink
+            to="https://actualbudget.org/docs/releases"
+            linkColor="purple"
+          >
             Release Notes
           </ExternalLink>
         </Text>
diff --git a/packages/desktop-client/src/components/spreadsheet/CellValue.tsx b/packages/desktop-client/src/components/spreadsheet/CellValue.tsx
index 2b7bc06bc36..6c1e725826c 100644
--- a/packages/desktop-client/src/components/spreadsheet/CellValue.tsx
+++ b/packages/desktop-client/src/components/spreadsheet/CellValue.tsx
@@ -31,6 +31,7 @@ function CellValue({
   getStyle,
   privacyFilter,
   'data-testid': testId,
+  ...props
 }: CellValueProps) {
   let { fullSheetName } = useSheetName(binding);
   let sheetValue = useSheetValue(binding);
@@ -54,6 +55,7 @@ function CellValue({
         }}
         data-testid={testId || fullSheetName}
         data-cellname={fullSheetName}
+        {...props}
       >
         {formatter ? formatter(sheetValue) : format(sheetValue, type)}
       </Text>
diff --git a/packages/desktop-client/src/components/table.tsx b/packages/desktop-client/src/components/table.tsx
index 95cb64a8760..5962eaba509 100644
--- a/packages/desktop-client/src/components/table.tsx
+++ b/packages/desktop-client/src/components/table.tsx
@@ -306,8 +306,9 @@ const readonlyInputStyle = {
 };
 
 type InputValueProps = ComponentProps<typeof Input> & {
-  value: string;
+  value?: string;
 };
+
 function InputValue({
   value: defaultValue,
   onUpdate,
diff --git a/packages/desktop-client/src/components/tooltips.js b/packages/desktop-client/src/components/tooltips.js
index ba82ea65604..6969e63d3f4 100644
--- a/packages/desktop-client/src/components/tooltips.js
+++ b/packages/desktop-client/src/components/tooltips.js
@@ -19,6 +19,7 @@ export function useTooltip() {
       },
     }),
     isOpen,
+    open: () => setIsOpen(true),
     close: () => setIsOpen(false),
   };
 }
diff --git a/packages/desktop-client/src/components/transactions/MobileTransaction.js b/packages/desktop-client/src/components/transactions/MobileTransaction.js
index 5cead48079a..8705224ac7a 100644
--- a/packages/desktop-client/src/components/transactions/MobileTransaction.js
+++ b/packages/desktop-client/src/components/transactions/MobileTransaction.js
@@ -498,7 +498,10 @@ class TransactionEditInner extends PureComponent {
               {!transaction.is_parent ? (
                 <TapField
                   value={category ? lookupName(categories, category) : null}
-                  disabled={(account && !!account.offbudget) || transferAcct}
+                  disabled={
+                    (account && !!account.offbudget) ||
+                    (transferAcct && !transferAcct.offbudget)
+                  }
                   // TODO: the button to turn this transaction into a split
                   // transaction was on top of the category button in the native
                   // app, on the right-hand side
@@ -567,14 +570,18 @@ class TransactionEditInner extends PureComponent {
                 />
               </View>
 
-              <View style={{ marginLeft: 35, marginRight: 35 }}>
+              <View style={{ marginLeft: 0, marginRight: 8 }}>
                 <FieldLabel title="Cleared" />
                 <BooleanField
                   checked={transaction.cleared}
                   onUpdate={checked =>
                     this.onEdit(transaction, 'cleared', checked)
                   }
-                  style={{ marginTop: 4 }}
+                  style={{
+                    margin: 'auto',
+                    width: 22,
+                    height: 22,
+                  }}
                 />
               </View>
             </View>
diff --git a/packages/desktop-client/src/components/util/AmountInput.js b/packages/desktop-client/src/components/util/AmountInput.js
index 2aeb94ab9b4..bc59bf268e4 100644
--- a/packages/desktop-client/src/components/util/AmountInput.js
+++ b/packages/desktop-client/src/components/util/AmountInput.js
@@ -1,9 +1,7 @@
 import React, { useRef, useState } from 'react';
 
-import {
-  currencyToInteger,
-  integerToCurrency,
-} from 'loot-core/src/shared/util';
+import evalArithmetic from 'loot-core/src/shared/arithmetic';
+import { amountToInteger } from 'loot-core/src/shared/util';
 
 import { useMergedRefs } from '../../hooks/useMergedRefs';
 import Add from '../../icons/v1/Add';
@@ -12,11 +10,12 @@ import { theme } from '../../style';
 import Button from '../common/Button';
 import InputWithContent from '../common/InputWithContent';
 import View from '../common/View';
+import useFormat from '../spreadsheet/useFormat';
 
 export function AmountInput({
   id,
   inputRef,
-  initialValue = 0,
+  initialValue,
   zeroSign = '-', // + or -
   onChange,
   onBlur,
@@ -24,10 +23,11 @@ export function AmountInput({
   textStyle,
   focused,
 }) {
+  let format = useFormat();
   let [negative, setNegative] = useState(
     (initialValue === 0 && zeroSign === '-') || initialValue < 0,
   );
-  let initialValueAbsolute = integerToCurrency(Math.abs(initialValue || 0));
+  let initialValueAbsolute = format(Math.abs(initialValue), 'financial');
   let [value, setValue] = useState(initialValueAbsolute);
   let buttonRef = useRef();
 
@@ -38,7 +38,7 @@ export function AmountInput({
 
   function fireChange(val, neg) {
     let valueOrInitial = Math.abs(
-      currencyToInteger(val ? val : initialValueAbsolute),
+      amountToInteger(evalArithmetic(val, initialValueAbsolute)),
     );
     let amount = neg ? valueOrInitial * -1 : valueOrInitial;
 
diff --git a/packages/desktop-client/src/style/styles.ts b/packages/desktop-client/src/style/styles.ts
index 7ec156c7b4e..78bf4b7d956 100644
--- a/packages/desktop-client/src/style/styles.ts
+++ b/packages/desktop-client/src/style/styles.ts
@@ -103,6 +103,16 @@ export const styles = {
       outline: 'none',
     },
   },
+  lineClamp: (lines: number) => {
+    return {
+      display: '-webkit-box',
+      WebkitLineClamp: lines,
+      WebkitBoxOrient: 'vertical',
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
+      wordBreak: 'break-word',
+    };
+  },
   // Dynamically set
   lightScrollbar: null as CSSProperties | null,
   darkScrollbar: null as CSSProperties | null,
diff --git a/packages/desktop-client/src/style/themes/dark.ts b/packages/desktop-client/src/style/themes/dark.ts
index 50b045f77dd..f86d870c6e2 100644
--- a/packages/desktop-client/src/style/themes/dark.ts
+++ b/packages/desktop-client/src/style/themes/dark.ts
@@ -195,7 +195,7 @@ export const formInputShadowSelected = colorPalette.purple200;
 export const altFormInputShadowSelected = formInputShadowSelected;
 export const formInputTextHighlight = colorPalette.purple400;
 
-export const pillBackground = colorPalette.navy600;
+export const pillBackground = colorPalette.navy800;
 export const pillText = colorPalette.navy200;
 export const pillTextHighlighted = colorPalette.purple500;
 export const pillBorder = colorPalette.navy700;
diff --git a/packages/desktop-electron/package.json b/packages/desktop-electron/package.json
index 7e6735e0199..44ab0e5b4ee 100644
--- a/packages/desktop-electron/package.json
+++ b/packages/desktop-electron/package.json
@@ -2,7 +2,7 @@
   "name": "desktop-electron",
   "productName": "Actual",
   "description": "A simple and powerful personal finance system",
-  "version": "23.10.0",
+  "version": "23.11.0",
   "scripts": {
     "clean": "rm -rf dist",
     "update-client": "bin/update-client",
diff --git a/packages/loot-core/src/client/SpreadsheetProvider.tsx b/packages/loot-core/src/client/SpreadsheetProvider.tsx
index 270cba1923a..bb30cda9537 100644
--- a/packages/loot-core/src/client/SpreadsheetProvider.tsx
+++ b/packages/loot-core/src/client/SpreadsheetProvider.tsx
@@ -4,7 +4,8 @@ import LRU from 'lru-cache';
 
 import { listen, send } from '../platform/client/fetch';
 
-const SpreadsheetContext = createContext(undefined);
+type SpreadsheetContextValue = ReturnType<typeof makeSpreadsheet>;
+const SpreadsheetContext = createContext<SpreadsheetContextValue>(undefined);
 
 export function useSpreadsheet() {
   return useContext(SpreadsheetContext);
diff --git a/packages/loot-core/src/client/actions/queries.ts b/packages/loot-core/src/client/actions/queries.ts
index 5631fcbdea0..c32d1ff5d65 100644
--- a/packages/loot-core/src/client/actions/queries.ts
+++ b/packages/loot-core/src/client/actions/queries.ts
@@ -216,7 +216,7 @@ export function updateGroup(group) {
   };
 }
 
-export function deleteGroup(id, transferId) {
+export function deleteGroup(id, transferId?) {
   return async function (dispatch, getState) {
     await send('category-group-delete', { id, transferId });
     await dispatch(getCategories());
diff --git a/packages/loot-core/src/mocks/budget.ts b/packages/loot-core/src/mocks/budget.ts
index 5d4849e49b6..2993722a67d 100644
--- a/packages/loot-core/src/mocks/budget.ts
+++ b/packages/loot-core/src/mocks/budget.ts
@@ -10,7 +10,6 @@ import { batchMessages, setSyncingMode } from '../server/sync';
 import * as monthUtils from '../shared/months';
 import q from '../shared/query';
 import type {
-  CategoryEntity,
   CategoryGroupEntity,
   PayeeEntity,
   TransactionEntity,
@@ -609,9 +608,7 @@ export async function createTestBudget(handlers) {
     }),
   );
 
-  let categoryGroups: Array<
-    CategoryGroupEntity & { categories: Omit<CategoryEntity, 'group'>[] }
-  > = [
+  let categoryGroups: Array<CategoryGroupEntity> = [
     {
       name: 'Usual Expenses',
       categories: [
diff --git a/packages/loot-core/src/server/db/index.ts b/packages/loot-core/src/server/db/index.ts
index 5e7d36cc98f..a06e08dc2d9 100644
--- a/packages/loot-core/src/server/db/index.ts
+++ b/packages/loot-core/src/server/db/index.ts
@@ -12,6 +12,7 @@ import { v4 as uuidv4 } from 'uuid';
 import * as fs from '../../platform/server/fs';
 import * as sqlite from '../../platform/server/sqlite';
 import { groupById } from '../../shared/util';
+import { CategoryEntity, CategoryGroupEntity } from '../../types/models';
 import {
   schema,
   schemaConfig,
@@ -271,28 +272,28 @@ export function updateWithSchema(table, fields) {
 // Data-specific functions. Ideally this would be split up into
 // different files
 
-export async function getCategories() {
-  return all(`
-    SELECT c.* FROM categories c
-      LEFT JOIN category_groups cg ON c.cat_group = cg.id
-      WHERE c.tombstone = 0
-      ORDER BY cg.sort_order, cg.id, c.sort_order, c.id
+export async function getCategories(): Promise<CategoryEntity[]> {
+  return await all(`
+    SELECT c.* FROM categories c WHERE c.tombstone = 0
+      ORDER BY c.sort_order, c.id
   `);
 }
 
-export async function getCategoriesGrouped() {
-  const groups = await all(
-    'SELECT * FROM category_groups WHERE tombstone = 0 ORDER BY is_income, sort_order, id',
-  );
-  const rows = await all(`
-    SELECT * FROM categories WHERE tombstone = 0
-      ORDER BY sort_order, id
+export async function getCategoriesGrouped(): Promise<
+  Array<CategoryGroupEntity>
+> {
+  const groups = await all(`
+    SELECT cg.* FROM category_groups cg WHERE cg.tombstone = 0 ORDER BY cg.is_income, cg.sort_order, cg.id
+  `);
+  const categories = await all(`
+    SELECT c.* FROM categories c WHERE c.tombstone = 0
+      ORDER BY c.sort_order, c.id
   `);
 
   return groups.map(group => {
     return {
       ...group,
-      categories: rows.filter(row => row.cat_group === group.id),
+      categories: categories.filter(c => c.cat_group === group.id),
     };
   });
 }
diff --git a/packages/loot-core/src/server/spreadsheet/spreadsheet.ts b/packages/loot-core/src/server/spreadsheet/spreadsheet.ts
index 53f62431d52..f098d85cd2e 100644
--- a/packages/loot-core/src/server/spreadsheet/spreadsheet.ts
+++ b/packages/loot-core/src/server/spreadsheet/spreadsheet.ts
@@ -5,7 +5,7 @@ import { compileQuery, runCompiledQuery, schema, schemaConfig } from '../aql';
 import Graph from './graph-data-structure';
 import { unresolveName, resolveName } from './util';
 
-type Node = {
+export type Node = {
   name: string;
   expr: string | number | boolean;
   value: string | number | boolean;
diff --git a/packages/loot-core/src/shared/months.ts b/packages/loot-core/src/shared/months.ts
index 1233a7a3319..4ea22213595 100644
--- a/packages/loot-core/src/shared/months.ts
+++ b/packages/loot-core/src/shared/months.ts
@@ -220,6 +220,11 @@ export function dayRangeInclusive(start: DateLike, end: DateLike) {
   return _dayRange(start, end, true);
 }
 
+export function getMonthFromIndex(year: string, monthIndex: number) {
+  const formatMonth = `${monthIndex + 1}`.padStart(2, '0');
+  return `${year}-${formatMonth}`;
+}
+
 export function getMonthIndex(month: string): number {
   return parseInt(month.slice(5, 7)) - 1;
 }
diff --git a/packages/loot-core/src/shared/schedules.ts b/packages/loot-core/src/shared/schedules.ts
index fd0dea98853..a6396b93b14 100644
--- a/packages/loot-core/src/shared/schedules.ts
+++ b/packages/loot-core/src/shared/schedules.ts
@@ -66,17 +66,21 @@ function prettyDayName(day) {
 export function getRecurringDescription(config) {
   let interval = config.interval || 1;
 
+  let weekendSolveSuffix = config.skipWeekend
+    ? ` (${config.weekendSolveMode} weekend) `
+    : '';
+
   switch (config.frequency) {
     case 'daily': {
       let desc = 'Every ';
       desc += interval !== 1 ? `${interval} days` : 'day';
-      return desc;
+      return desc + weekendSolveSuffix;
     }
     case 'weekly': {
       let desc = 'Every ';
       desc += interval !== 1 ? `${interval} weeks` : 'week';
       desc += ' on ' + monthUtils.format(config.start, 'EEEE');
-      return desc;
+      return desc + weekendSolveSuffix;
     }
     case 'monthly': {
       let desc = 'Every ';
@@ -145,13 +149,13 @@ export function getRecurringDescription(config) {
         desc += ' on the ' + monthUtils.format(config.start, 'do');
       }
 
-      return desc;
+      return desc + weekendSolveSuffix;
     }
     case 'yearly': {
       let desc = 'Every ';
       desc += interval !== 1 ? `${interval} years` : 'year';
       desc += ' on ' + monthUtils.format(config.start, 'LLL do');
-      return desc;
+      return desc + weekendSolveSuffix;
     }
     default:
       return 'Recurring error';
diff --git a/packages/loot-core/src/types/models/category-group.d.ts b/packages/loot-core/src/types/models/category-group.d.ts
index eca289e442e..4225ad68387 100644
--- a/packages/loot-core/src/types/models/category-group.d.ts
+++ b/packages/loot-core/src/types/models/category-group.d.ts
@@ -4,4 +4,6 @@ export interface CategoryGroupEntity {
   is_income?: boolean;
   sort_order?: number;
   tombstone?: boolean;
+  hidden?: boolean;
+  categories?: CategoryEntity[];
 }
diff --git a/packages/loot-core/src/types/models/category.d.ts b/packages/loot-core/src/types/models/category.d.ts
index b495fe0d045..2eb075de375 100644
--- a/packages/loot-core/src/types/models/category.d.ts
+++ b/packages/loot-core/src/types/models/category.d.ts
@@ -1,10 +1,9 @@
-import type { CategoryGroupEntity } from './category-group';
-
 export interface CategoryEntity {
   id?: string;
   name: string;
   is_income?: boolean;
-  group: CategoryGroupEntity;
+  cat_group?: string;
   sort_order?: number;
   tombstone?: boolean;
+  hidden?: boolean;
 }
diff --git a/packages/loot-core/src/types/prefs.d.ts b/packages/loot-core/src/types/prefs.d.ts
index e18f1d23a84..65a04d46063 100644
--- a/packages/loot-core/src/types/prefs.d.ts
+++ b/packages/loot-core/src/types/prefs.d.ts
@@ -27,9 +27,10 @@ export type LocalPrefs = Partial<
     'expand-splits': boolean;
     [key: `show-extra-balances-${string}`]: boolean;
     [key: `hide-cleared-${string}`]: boolean;
-    'budget.collapsed': boolean;
+    'budget.collapsed': string[];
     'budget.summaryCollapsed': boolean;
     'budget.showHiddenCategories': boolean;
+    'budget.startMonth': string;
     // TODO: pull from src/components/modals/ImportTransactions.js
     [key: `parse-date-${string}-${'csv' | 'qif'}`]: string;
     [key: `csv-mappings-${string}`]: string;
diff --git a/packages/loot-core/src/types/server-handlers.d.ts b/packages/loot-core/src/types/server-handlers.d.ts
index 82660722163..65d85e18f53 100644
--- a/packages/loot-core/src/types/server-handlers.d.ts
+++ b/packages/loot-core/src/types/server-handlers.d.ts
@@ -3,9 +3,10 @@ import { ParseFileResult } from '../server/accounts/parse-file';
 import { batchUpdateTransactions } from '../server/accounts/transactions';
 import { Backup } from '../server/backups';
 import { RemoteFile } from '../server/cloud-storage';
+import { Node as SpreadsheetNode } from '../server/spreadsheet/spreadsheet';
 import { Message } from '../server/sync';
 
-import { AccountEntity, PayeeEntity } from './models';
+import { AccountEntity, CategoryEntity, CategoryGroupEntity } from './models';
 import { EmptyObject } from './util';
 
 export interface ServerHandlers {
@@ -43,32 +44,27 @@ export interface ServerHandlers {
   'transactions-export-query': (arg: { query: queryState }) => Promise<unknown>;
 
   'get-categories': () => Promise<{
-    grouped: {
-      id: string;
-      name: string;
-      is_income: number;
-      sort_order: number;
-      tombstone: number;
-      hidden: boolean;
-    }[];
-    list: {
-      id: string;
-      name: string;
-      is_income: number;
-      cat_group: string;
-      sort_order: number;
-      tombstone: number;
-      hidden: boolean;
-    }[];
+    grouped: Array<CategoryGroupEntity>;
+    list: Array<CategoryEntity>;
   }>;
 
   'get-earliest-transaction': () => Promise<unknown>;
 
   'get-budget-bounds': () => Promise<{ start: string; end: string }>;
 
-  'rollover-budget-month': (arg: { month }) => Promise<unknown>;
+  'rollover-budget-month': (arg: { month }) => Promise<
+    {
+      value: string | number | boolean;
+      name: string;
+    }[]
+  >;
 
-  'report-budget-month': (arg: { month }) => Promise<unknown>;
+  'report-budget-month': (arg: { month }) => Promise<
+    {
+      value: string | number | boolean;
+      name: string;
+    }[]
+  >;
 
   'budget-set-type': (arg: { type }) => Promise<unknown>;
 
@@ -115,7 +111,10 @@ export interface ServerHandlers {
     conditions;
   }) => Promise<{ filters: unknown[] }>;
 
-  getCell: (arg: { sheetName; name }) => Promise<unknown>;
+  getCell: (arg: {
+    sheetName;
+    name;
+  }) => Promise<SpreadsheetNode | { value?: SpreadsheetNode['value'] }>;
 
   getCells: (arg: { names }) => Promise<unknown>;
 
diff --git a/upcoming-release-notes/1662.md b/upcoming-release-notes/1662.md
deleted file mode 100644
index 4800358b666..00000000000
--- a/upcoming-release-notes/1662.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: Enhancements
-authors: [joel-jeremy, dmlazaro]
----
-Editable mobile budget cells
diff --git a/upcoming-release-notes/1694.md b/upcoming-release-notes/1694.md
deleted file mode 100644
index 0892ca3bac3..00000000000
--- a/upcoming-release-notes/1694.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [MatissJanis]
----
-
-Desktop: reconnect to websockets if connection lost or server restarted
diff --git a/upcoming-release-notes/1720.md b/upcoming-release-notes/1720.md
deleted file mode 100644
index 0d72060aa8e..00000000000
--- a/upcoming-release-notes/1720.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [youngcw]
----
-
-Goals: speedup by only run the requested priority levels, skip others
diff --git a/upcoming-release-notes/1724.md b/upcoming-release-notes/1724.md
deleted file mode 100644
index b4308edd4a0..00000000000
--- a/upcoming-release-notes/1724.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [carkom]
----
-
-Consolidate notice colors.
\ No newline at end of file
diff --git a/upcoming-release-notes/1737.md b/upcoming-release-notes/1737.md
deleted file mode 100644
index 41fd66c85fc..00000000000
--- a/upcoming-release-notes/1737.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [joel-jeremy]
----
-
-Various mobile category and group functionalities.
\ No newline at end of file
diff --git a/upcoming-release-notes/1740.md b/upcoming-release-notes/1740.md
deleted file mode 100644
index 8a7b1d32e3e..00000000000
--- a/upcoming-release-notes/1740.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [shaankhosla]
----
-
-Update the NetWorth graph to use the Recharts library.
\ No newline at end of file
diff --git a/upcoming-release-notes/1743.md b/upcoming-release-notes/1743.md
deleted file mode 100644
index 6d54cd5d2d3..00000000000
--- a/upcoming-release-notes/1743.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [Jod929]
----
-
-refactor the following to tsx: IncomeGroup, IncomeHeader, MonthsContext, RenderMonths, SidebarGroup.
\ No newline at end of file
diff --git a/upcoming-release-notes/1745.md b/upcoming-release-notes/1745.md
deleted file mode 100644
index 356a8157cd1..00000000000
--- a/upcoming-release-notes/1745.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [joel-jeremy,MatissJanis]
----
-
-Hide mobile nav bar when scrolling
diff --git a/upcoming-release-notes/1750.md b/upcoming-release-notes/1750.md
deleted file mode 100644
index cb2f399c5e1..00000000000
--- a/upcoming-release-notes/1750.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [shall0pass]
----
-
-End of month cleanup - fixed condition that caused an error with null carryover value
diff --git a/upcoming-release-notes/1751.md b/upcoming-release-notes/1751.md
deleted file mode 100644
index 8ff15646aeb..00000000000
--- a/upcoming-release-notes/1751.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [joel-jeremy]
----
-
-Prevent parent transaction being added to transfer account when splitting an existing transaction.
diff --git a/upcoming-release-notes/1753.md b/upcoming-release-notes/1753.md
deleted file mode 100644
index 0e04fb44e96..00000000000
--- a/upcoming-release-notes/1753.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [shall0pass]
----
-
-Goals - Fix schedules 'in between' calculation
diff --git a/upcoming-release-notes/1755.md b/upcoming-release-notes/1755.md
deleted file mode 100644
index 9a27e1ed88c..00000000000
--- a/upcoming-release-notes/1755.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MikesGlitch]
----
-
-Convert CreateAccount and CreateEncryptionKey components to TypeScript.
diff --git a/upcoming-release-notes/1756.md b/upcoming-release-notes/1756.md
deleted file mode 100644
index 8f0807b2308..00000000000
--- a/upcoming-release-notes/1756.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [carkom]
----
-
-Conslidating and making consistent error colors across all pages in the app.
diff --git a/upcoming-release-notes/1765.md b/upcoming-release-notes/1765.md
new file mode 100644
index 00000000000..023b0b4297e
--- /dev/null
+++ b/upcoming-release-notes/1765.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [Evomatic]
+---
+
+Dark mode - darker tint for pageTextLink.
diff --git a/upcoming-release-notes/1768.md b/upcoming-release-notes/1768.md
deleted file mode 100644
index b8b0545a6a8..00000000000
--- a/upcoming-release-notes/1768.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MikesGlitch]
----
-
-Convert BudgetSummary modal(mobile) and CreateLocalAccounts components to TypeScript.
diff --git a/upcoming-release-notes/1770.md b/upcoming-release-notes/1770.md
deleted file mode 100644
index a73c4ca0ad8..00000000000
--- a/upcoming-release-notes/1770.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [Compositr, shaankhosla]
----
-
-Sync on Ctrl+S
\ No newline at end of file
diff --git a/upcoming-release-notes/1774.md b/upcoming-release-notes/1774.md
deleted file mode 100644
index 1ad0be8ce55..00000000000
--- a/upcoming-release-notes/1774.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [KaiBelmo]
----
-
-Fix selecting delimiters in CSV options when uploading a CSV; it will apply to parsing. Also added a new delimiter '|'.
\ No newline at end of file
diff --git a/upcoming-release-notes/1776.md b/upcoming-release-notes/1776.md
deleted file mode 100644
index d4c2cd9e547..00000000000
--- a/upcoming-release-notes/1776.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MikesGlitch]
----
-
-Convert DateSelect component to TypeScript and update category query type.
diff --git a/upcoming-release-notes/1783.md b/upcoming-release-notes/1783.md
deleted file mode 100644
index c466bfdc4e7..00000000000
--- a/upcoming-release-notes/1783.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [joel-jeremy]
----
-
-Fix alignment of mobile budget header elements.
diff --git a/upcoming-release-notes/1784.md b/upcoming-release-notes/1784.md
deleted file mode 100644
index 530c9a07ec3..00000000000
--- a/upcoming-release-notes/1784.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MikesGlitch]
----
-
-Convert FixEncryptionKey, Loading, AnimatedLoading components to TypeScript and update get-payee query type.
diff --git a/upcoming-release-notes/1785.md b/upcoming-release-notes/1785.md
deleted file mode 100644
index 52406089dfb..00000000000
--- a/upcoming-release-notes/1785.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MikesGlitch]
----
-
-Update generated icons to typescript
diff --git a/upcoming-release-notes/1795.md b/upcoming-release-notes/1795.md
deleted file mode 100644
index 929e65f9312..00000000000
--- a/upcoming-release-notes/1795.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [youngcw]
----
-
-Dark Theme: add theming to budget table where it was missing
diff --git a/upcoming-release-notes/1797.md b/upcoming-release-notes/1797.md
deleted file mode 100644
index ca29b85030b..00000000000
--- a/upcoming-release-notes/1797.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [miqh]
----
-
-Adjust casing of theme options for consistent presentation.
diff --git a/upcoming-release-notes/1799.md b/upcoming-release-notes/1799.md
deleted file mode 100644
index a66d715b823..00000000000
--- a/upcoming-release-notes/1799.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: Enhancements
-authors: [carkom]
----
-Consolidating and making consistent page colors
diff --git a/upcoming-release-notes/1800.md b/upcoming-release-notes/1800.md
deleted file mode 100644
index ce17a7e7b5b..00000000000
--- a/upcoming-release-notes/1800.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: Enhancements
-authors: [carkom]
----
-Fixes dark mode issues: server status color, and upcoming pill on schedules page
diff --git a/upcoming-release-notes/1808.md b/upcoming-release-notes/1808.md
deleted file mode 100644
index dd21148d476..00000000000
--- a/upcoming-release-notes/1808.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [joel-jeremy]
----
-
-Fix flaky mobile back button on account transactions.
diff --git a/upcoming-release-notes/1814.md b/upcoming-release-notes/1814.md
deleted file mode 100644
index f04b5b376d9..00000000000
--- a/upcoming-release-notes/1814.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [shaankhosla]
----
-
-Added 2 new VRT tests for reports. 
diff --git a/upcoming-release-notes/1819.md b/upcoming-release-notes/1819.md
deleted file mode 100644
index 4f0c8ee8fb6..00000000000
--- a/upcoming-release-notes/1819.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [shaankhosla]
----
-
-Fix styling on cash-flow graph.
diff --git a/upcoming-release-notes/1820.md b/upcoming-release-notes/1820.md
new file mode 100644
index 00000000000..c678478a00d
--- /dev/null
+++ b/upcoming-release-notes/1820.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [KaiBelmo]
+---
+
+Fix styling of transaction page on mobile.
\ No newline at end of file
diff --git a/upcoming-release-notes/1823.md b/upcoming-release-notes/1823.md
deleted file mode 100644
index 4df7bd57b66..00000000000
--- a/upcoming-release-notes/1823.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MikesGlitch]
----
-
-Convert Sort Utils, DisplayId, PlaidExternalMsg components to Typescript
diff --git a/upcoming-release-notes/1834.md b/upcoming-release-notes/1834.md
new file mode 100644
index 00000000000..4e74b5e428b
--- /dev/null
+++ b/upcoming-release-notes/1834.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MikesGlitch]
+---
+
+Convert Titlebar, BudgetPageHeader, DynamicBudgetTable, Tooltips components to Typescript.
diff --git a/upcoming-release-notes/1840.md b/upcoming-release-notes/1840.md
new file mode 100644
index 00000000000..4d7462a2bb6
--- /dev/null
+++ b/upcoming-release-notes/1840.md
@@ -0,0 +1,5 @@
+---
+category: Bugfix
+authors: [sethgillett]
+---
+Schedule creation modal notify user of weekend skip option
diff --git a/upcoming-release-notes/1759.md b/upcoming-release-notes/1858.md
similarity index 62%
rename from upcoming-release-notes/1759.md
rename to upcoming-release-notes/1858.md
index d66e13d3408..e93688883cd 100644
--- a/upcoming-release-notes/1759.md
+++ b/upcoming-release-notes/1858.md
@@ -3,4 +3,4 @@ category: Enhancements
 authors: [joel-jeremy]
 ---
 
-Allow linked child transactions.
+Mobile budget pull down to sync.