dataframe-textual 1.5.0__py3-none-any.whl → 1.10.1__py3-none-any.whl

dataframe_textual/data_frame_table.py

@@ -12,6 +12,7 @@ from rich.text import Text
 from textual import work
 from textual.coordinate import Coordinate
 from textual.events import Click
+from textual.reactive import reactive
 from textual.render import measure
 from textual.widgets import DataTable, TabPane
 from textual.widgets._data_table import (
@@ -79,6 +80,7 @@ class History:
     fixed_columns: int
     cursor_coordinate: Coordinate
     matches: dict[int, set[int]]
+    dirty: bool = False  # Whether this history state has unsaved changes
 
 
 @dataclass
@@ -112,11 +114,18 @@ class DataFrameTable(DataTable):
         - **↑↓←→** - 🎯 Move cursor (cell/row/column)
         - **g** - ⬆️ Jump to first row
         - **G** - ⬇️ Jump to last row
+        - **HOME/END** - 🎯 Jump to first/last column
+        - **Ctrl+HOME/END** - 🎯 Jump to page top/bottom
         - **Ctrl+F** - 📜 Page down
         - **Ctrl+B** - 📜 Page up
         - **PgUp/PgDn** - 📜 Page up/down
 
-        ## 👁️ View & Display
+        ## ♻️ Undo/Redo/Reset
+        - **u** - ↩️ Undo last action
+        - **U** - 🔄 Redo last undone action
+        - **Ctrl+U** - 🔁 Reset to initial state
+
+        ## 👁️ Viewing & Display
         - **Enter** - 📋 Show row details in modal
         - **F** - 📊 Show frequency distribution
         - **s** - 📈 Show statistics for current column
@@ -134,7 +143,7 @@ class DataFrameTable(DataTable):
         - **]** - 🔽 Sort column descending
         - *(Multi-column sort supported)*
 
-        ## 🔍 Search & Filter
+        ## 🔍 Searching & Filtering
         - **|** - 🔎 Search in current column with expression
         - **\\\\** - 🔎 Search in current column using cursor value
         - **/** - 🔎 Find in current column with cursor value
@@ -143,8 +152,8 @@ class DataFrameTable(DataTable):
         - **:** - 🌐 Global find with expression
         - **n** - ⬇️ Go to next match
         - **N** - ⬆️ Go to previous match
-        - **v** - 👁️ View/filter rows by cell or selected rows
-        - **V** - 🔧 View/filter rows by expression
+        - **v** - 👁️ View/filter rows by cell or selected rows and hide others
+        - **V** - 🔧 View/filter rows by expression and hide others
         - *(All search/find support case-insensitive & whole-word matching)*
 
         ## ✏️ Replace
@@ -152,24 +161,25 @@ class DataFrameTable(DataTable):
         - **R** - 🔄 Replace across all columns (interactive or all)
         - *(Supports case-insensitive & whole-word matching)*
 
-        ## ✅ Selection & Filtering
+        ## ✅ Selection & Filter
         - **'** - ✓️ Select/deselect current row
         - **t** - 💡 Toggle row selection (invert all)
+        - **T** - 🧹 Clear all selections and matches
         - **{** - ⬆️ Go to previous selected row
         - **}** - ⬇️ Go to next selected row
-        - **"** - 📍 Filter to show only selected rows
-        - **T** - 🧹 Clear all selections and matches
+        - **"** - 📍 Filter selected rows and remove others
 
         ## 🔍 SQL Interface
-        - **l** - 💬 Open simple SQL interface (select columns & WHERE clause)
+        - **l** - 💬 Open simple SQL interface (select columns & where clause)
         - **L** - 🔎 Open advanced SQL interface (full SQL queries)
 
-        ## ✏️ Edit & Modify
+        ## ✏️ Editing
         - **Double-click** - ✍️ Edit cell or rename column header
         - **e** - ✍️ Edit current cell
         - **E** - 📊 Edit entire column with expression
         - **a** - ➕ Add empty column after current
         - **A** - ➕ Add column with name and optional expression
+        - **@** - 🔗 Add a new link column from template
         - **x** - ❌ Delete current row
         - **X** - ❌ Delete row and those below
         - **Ctrl+X** - ❌ Delete row and those above
@@ -182,23 +192,17 @@ class DataFrameTable(DataTable):
         - **Shift+↑↓** - ⬆️⬇️ Move row up/down
         - **Shift+←→** - ⬅️➡️ Move column left/right
 
-        ## 🎨 Type Conversion
+        ## 🎨 Type Casting
         - **#** - 🔢 Cast column to integer
         - **%** - 🔢 Cast column to float
         - **!** - ✅ Cast column to boolean
         - **$** - 📝 Cast column to string
 
-        ## 🔗 URL Handling
-        - **@** - 🔗 Add a new link column from template expression (e.g., `https://example.com/$_`)
-
-        ## 💾 Data Management
+        ## 💾 Copy & Save
         - **c** - 📋 Copy cell to clipboard
         - **Ctrl+c** - 📊 Copy column to clipboard
         - **Ctrl+r** - 📝 Copy row to clipboard (tab-separated)
         - **Ctrl+s** - 💾 Save current tab to file
-        - **u** - ↩️ Undo last action
-        - **U** - 🔄 Redo last undone action
-        - **Ctrl+U** - 🔁 Reset to initial state
     """).strip()
 
     # fmt: off
@@ -208,6 +212,10 @@ class DataFrameTable(DataTable):
         ("G", "jump_bottom", "Jump to bottom"),
         ("ctrl+f", "forward_page", "Page down"),
         ("ctrl+b", "backward_page", "Page up"),
+        # Undo/Redo/Reset
+        ("u", "undo", "Undo"),
+        ("U", "redo", "Redo"),
+        ("ctrl+u", "reset", "Reset to initial state"),
         # Display
         ("h", "hide_column", "Hide column"),
         ("H", "show_hidden_rows_columns", "Show hidden rows/columns"),
@@ -274,7 +282,7 @@ class DataFrameTable(DataTable):
         ("shift+right", "move_column_right", "Move column right"),
         ("shift+up", "move_row_up", "Move row up"),
         ("shift+down", "move_row_down", "Move row down"),
-        # Type Conversion
+        # Type Casting
         ("number_sign", "cast_column_dtype('pl.Int64')", "Cast column dtype to integer"),  # `#`
         ("percent_sign", "cast_column_dtype('pl.Float64')", "Cast column dtype to float"),  # `%`
         ("exclamation_mark", "cast_column_dtype('pl.Boolean')", "Cast column dtype to bool"),  # `!`
@@ -282,14 +290,13 @@ class DataFrameTable(DataTable):
         # Sql
         ("l", "simple_sql", "Simple SQL interface"),
         ("L", "advanced_sql", "Advanced SQL interface"),
-        # Undo/Redo
-        ("u", "undo", "Undo"),
-        ("U", "redo", "Redo"),
-        ("ctrl+u", "reset", "Reset to initial state"),
     ]
     # fmt: on
 
-    def __init__(self, df: pl.DataFrame, filename: str = "", name: str = "", **kwargs) -> None:
+    # Track if dataframe has unsaved changes
+    dirty: reactive[bool] = reactive(False)
+
+    def __init__(self, df: pl.DataFrame, filename: str = "", tabname: str = "", **kwargs) -> None:
         """Initialize the DataFrameTable with a dataframe and manage all state.
 
         Sets up the table widget with display configuration, loads the dataframe, and
@@ -298,19 +305,16 @@ class DataFrameTable(DataTable):
         Args:
             df: The Polars DataFrame to display and edit.
             filename: Optional source filename for the data (used in save operations). Defaults to "".
-            name: Optional display name for the table tab. Defaults to "" (uses filename stem).
+            tabname: Optional name for the tab displaying this dataframe. Defaults to "".
             **kwargs: Additional keyword arguments passed to the parent DataTable widget.
-
-        Returns:
-            None
         """
-        super().__init__(name=(name or Path(filename).stem), **kwargs)
+        super().__init__(**kwargs)
 
         # DataFrame state
         self.dataframe = df  # Original dataframe
         self.df = df  # Internal/working dataframe
-        self.filename = filename  # Current filename
-
+        self.filename = filename or "untitled.csv"  # Current filename
+        self.tabname = tabname or Path(filename).stem  # Tab name
         # Pagination & Loading
         self.INITIAL_BATCH_SIZE = (self.app.size.height // 100 + 1) * 100
         self.BATCH_SIZE = self.INITIAL_BATCH_SIZE // 2
@@ -332,9 +336,6 @@ class DataFrameTable(DataTable):
         # Current history state for redo
         self.history: History = None
 
-        # Pending filename for save operations
-        self._pending_filename = ""
-
         # Whether to use thousand separator for numeric display
         self.thousand_separator = False
 
@@ -433,6 +434,15 @@ class DataFrameTable(DataTable):
                 matches.append((ridx, cidx))
         return matches
 
+    @property
+    def last_history(self) -> History:
+        """Get the last history state.
+
+        Returns:
+            History: The most recent History object from the histories deque.
+        """
+        return self.histories[-1] if self.histories else None
+
     def get_row_key(self, row_idx: int) -> RowKey:
         """Get the row key for a given table row index.
 
@@ -455,7 +465,7 @@ class DataFrameTable(DataTable):
         """
         return self._column_locations.get_key(col_idx)
 
-    def _should_highlight(self, cursor: Coordinate, target_cell: Coordinate, type_of_cursor: CursorType) -> bool:
+    def should_highlight(self, cursor: Coordinate, target_cell: Coordinate, type_of_cursor: CursorType) -> bool:
         """Determine if the given cell should be highlighted because of the cursor.
 
         In "cell" mode, also highlights the row and column headers. In "row" and "column"
@@ -498,9 +508,6 @@ class DataFrameTable(DataTable):
         Args:
             old_coordinate: The previous cursor coordinate.
             new_coordinate: The new cursor coordinate.
-
-        Returns:
-            None
         """
         if old_coordinate != new_coordinate:
             # Emit CellSelected message for cell cursor type (keyboard navigation only)
@@ -538,6 +545,27 @@ class DataFrameTable(DataTable):
             else:
                 self._scroll_cursor_into_view()
 
+    def watch_dirty(self, old_dirty: bool, new_dirty: bool) -> None:
+        """Watch for changes to the dirty state and update tab title.
+
+        When new_dirty is True, set the tab color to red.
+        When new_dirty is False, remove the red color.
+
+        Args:
+            old_dirty: The old dirty state.
+            new_dirty: The new dirty state.
+        """
+        if old_dirty == new_dirty:
+            return  # No change
+
+        # Find the corresponding ContentTab
+        content_tab = self.app.query_one(f"#--content-tab-{self.id}")
+        if content_tab:
+            if new_dirty:
+                content_tab.add_class("dirty")
+            else:
+                content_tab.remove_class("dirty")
+
     def move_cursor_to(self, ridx: int, cidx: int) -> None:
         """Move cursor based on the dataframe indices.
 
@@ -547,7 +575,7 @@ class DataFrameTable(DataTable):
         """
         # Ensure the target row is loaded
         if ridx >= self.loaded_rows:
-            self._load_rows(stop=ridx + self.BATCH_SIZE)
+            self.load_rows(stop=ridx + self.BATCH_SIZE)
 
         row_key = str(ridx)
         col_key = self.df.columns[cidx]
@@ -559,11 +587,8 @@ class DataFrameTable(DataTable):
 
         Called by Textual when the widget is first added to the display tree.
         Currently a placeholder as table setup is deferred until first use.
-
-        Returns:
-            None
         """
-        # self._setup_table()
+        # self.setup_table()
         pass
 
     def on_key(self, event) -> None:
@@ -574,13 +599,10 @@ class DataFrameTable(DataTable):
 
         Args:
             event: The key event object.
-
-        Returns:
-            None
         """
         if event.key in ("pagedown", "down"):
             # Let the table handle the navigation first
-            self._check_and_load_more()
+            self.check_and_load_more()
 
     def on_click(self, event: Click) -> None:
         """Handle mouse click events on the table.
@@ -589,9 +611,6 @@ class DataFrameTable(DataTable):
 
         Args:
             event: The click event containing row and column information.
-
-        Returns:
-            None
         """
         if self.cursor_type == "cell" and event.chain > 1:  # only on double-click or more
             try:
@@ -602,9 +621,9 @@ class DataFrameTable(DataTable):
 
             # header row
             if row_idx == -1:
-                self._rename_column()
+                self.do_rename_column()
             else:
-                self._edit_cell()
+                self.do_edit_cell()
 
     # Action handlers for BINDINGS
     def action_jump_top(self) -> None:
@@ -613,12 +632,12 @@ class DataFrameTable(DataTable):
 
     def action_jump_bottom(self) -> None:
         """Jump to the bottom of the table."""
-        self._load_rows(move_to_end=True)
+        self.load_rows(move_to_end=True)
 
     def action_forward_page(self) -> None:
         """Scroll down one page."""
         super().action_page_down()
-        self._check_and_load_more()
+        self.check_and_load_more()
 
     def action_backward_page(self) -> None:
         """Scroll up one page."""
@@ -626,39 +645,39 @@ class DataFrameTable(DataTable):
 
     def action_view_row_detail(self) -> None:
         """View details of the current row."""
-        self._view_row_detail()
+        self.do_view_row_detail()
 
     def action_delete_column(self) -> None:
         """Delete the current column."""
-        self._delete_column()
+        self.do_delete_column()
 
     def action_hide_column(self) -> None:
         """Hide the current column."""
-        self._hide_column()
+        self.do_hide_column()
 
     def action_expand_column(self) -> None:
         """Expand the current column to its full width."""
-        self._expand_column()
+        self.do_expand_column()
 
     def action_show_hidden_rows_columns(self) -> None:
         """Show all hidden rows/columns."""
-        self._show_hidden_rows_columns()
+        self.do_show_hidden_rows_columns()
 
     def action_sort_ascending(self) -> None:
         """Sort by current column in ascending order."""
-        self._sort_by_column(descending=False)
+        self.do_sort_by_column(descending=False)
 
     def action_sort_descending(self) -> None:
         """Sort by current column in descending order."""
-        self._sort_by_column(descending=True)
+        self.do_sort_by_column(descending=True)
 
     def action_save_to_file(self) -> None:
         """Save the current dataframe to a file."""
-        self._save_to_file()
+        self.do_save_to_file()
 
     def action_show_frequency(self) -> None:
         """Show frequency distribution for the current column."""
-        self._show_frequency()
+        self.do_show_frequency()
 
     def action_show_statistics(self, scope: str = "column") -> None:
         """Show statistics for the current column or entire dataframe.
@@ -666,51 +685,51 @@ class DataFrameTable(DataTable):
         Args:
             scope: Either "column" for current column stats or "dataframe" for all columns.
         """
-        self._show_statistics(scope)
+        self.do_show_statistics(scope)
 
     def action_view_rows(self) -> None:
         """View rows by current cell value."""
-        self._view_rows()
+        self.do_view_rows()
 
     def action_view_rows_expr(self) -> None:
         """Open the advanced filter screen."""
-        self._view_rows_expr()
+        self.do_view_rows_expr()
 
     def action_edit_cell(self) -> None:
         """Edit the current cell."""
-        self._edit_cell()
+        self.do_edit_cell()
 
     def action_edit_column(self) -> None:
         """Edit the entire current column with an expression."""
-        self._edit_column()
+        self.do_edit_column()
 
     def action_add_column(self) -> None:
         """Add an empty column after the current column."""
-        self._add_column()
+        self.do_add_column()
 
     def action_add_column_expr(self) -> None:
         """Add a new column with optional expression after the current column."""
-        self._add_column_expr()
+        self.do_add_column_expr()
 
     def action_add_link_column(self) -> None:
         """Open AddLinkScreen to create a new link column from a Polars expression."""
-        self._add_link_column()
+        self.do_add_link_column()
 
     def action_rename_column(self) -> None:
         """Rename the current column."""
-        self._rename_column()
+        self.do_rename_column()
 
     def action_clear_cell(self) -> None:
         """Clear the current cell (set to None)."""
-        self._clear_cell()
+        self.do_clear_cell()
 
     def action_search_cursor_value(self) -> None:
         """Search cursor value in the current column."""
-        self._search_cursor_value()
+        self.do_search_cursor_value()
 
     def action_search_expr(self) -> None:
         """Search by expression in the current column."""
-        self._search_expr()
+        self.do_search_expr()
 
     def action_find_cursor_value(self, scope="column") -> None:
         """Find by cursor value.
@@ -718,7 +737,7 @@ class DataFrameTable(DataTable):
         Args:
             scope: "column" to find in current column, "global" to find across all columns.
         """
-        self._find_cursor_value(scope=scope)
+        self.do_find_cursor_value(scope=scope)
 
     def action_find_expr(self, scope="column") -> None:
         """Find by expression.
@@ -726,88 +745,87 @@ class DataFrameTable(DataTable):
         Args:
             scope: "column" to find in current column, "global" to find across all columns.
         """
-        self._find_expr(scope=scope)
+        self.do_find_expr(scope=scope)
 
     def action_replace(self) -> None:
         """Replace values in current column."""
-        self._replace()
+        self.do_replace()
 
     def action_replace_global(self) -> None:
         """Replace values across all columns."""
-        self._replace_global()
+        self.do_replace_global()
 
     def action_toggle_row_selection(self) -> None:
         """Toggle selection for the current row."""
-        self._toggle_row_selection()
+        self.do_toggle_row_selection()
 
     def action_toggle_selections(self) -> None:
         """Toggle all row selections."""
-        self._toggle_selections()
+        self.do_toggle_selections()
 
     def action_filter_rows(self) -> None:
         """Filter to show only selected rows."""
-        self._filter_rows()
+        self.do_filter_rows()
 
     def action_delete_row(self) -> None:
         """Delete the current row."""
-        self._delete_row()
+        self.do_delete_row()
 
     def action_delete_row_and_below(self) -> None:
         """Delete the current row and those below."""
-        self._delete_row(more="below")
+        self.do_delete_row(more="below")
 
     def action_delete_row_and_up(self) -> None:
         """Delete the current row and those above."""
-        self._delete_row(more="above")
+        self.do_delete_row(more="above")
 
     def action_duplicate_column(self) -> None:
         """Duplicate the current column."""
-        self._duplicate_column()
+        self.do_duplicate_column()
 
     def action_duplicate_row(self) -> None:
         """Duplicate the current row."""
-        self._duplicate_row()
+        self.do_duplicate_row()
 
     def action_undo(self) -> None:
         """Undo the last action."""
-        self._undo()
+        self.do_undo()
 
     def action_redo(self) -> None:
         """Redo the last undone action."""
-        self._redo()
+        self.do_redo()
 
     def action_reset(self) -> None:
         """Reset to the initial state."""
-        self._setup_table(reset=True)
-        self.notify("Restored initial state", title="Reset")
+        self.do_reset()
 
     def action_move_column_left(self) -> None:
         """Move the current column to the left."""
-        self._move_column("left")
+        self.do_move_column("left")
 
     def action_move_column_right(self) -> None:
         """Move the current column to the right."""
-        self._move_column("right")
+        self.do_move_column("right")
 
     def action_move_row_up(self) -> None:
         """Move the current row up."""
-        self._move_row("up")
+        self.do_move_row("up")
 
     def action_move_row_down(self) -> None:
         """Move the current row down."""
-        self._move_row("down")
+        self.do_move_row("down")
 
     def action_clear_selections_and_matches(self) -> None:
         """Clear all row selections and matches."""
-        self._clear_selections_and_matches()
+        self.do_clear_selections_and_matches()
 
     def action_cycle_cursor_type(self) -> None:
         """Cycle through cursor types."""
-        self._cycle_cursor_type()
+        self.do_cycle_cursor_type()
 
     def action_freeze_row_column(self) -> None:
         """Open the freeze screen."""
-        self._freeze_row_column()
+        self.do_freeze_row_column()
 
     def action_toggle_row_labels(self) -> None:
         """Toggle row labels visibility."""
@@ -817,7 +835,7 @@ class DataFrameTable(DataTable):
 
     def action_cast_column_dtype(self, dtype: str | pl.DataType) -> None:
         """Cast the current column to a different data type."""
-        self._cast_column_dtype(dtype)
+        self.do_cast_column_dtype(dtype)
 
     def action_copy_cell(self) -> None:
         """Copy the current cell to clipboard."""
@@ -826,7 +844,7 @@ class DataFrameTable(DataTable):
 
         try:
             cell_str = str(self.df.item(ridx, cidx))
-            self._copy_to_clipboard(cell_str, f"Copied: [$success]{cell_str[:50]}[/]")
+            self.do_copy_to_clipboard(cell_str, f"Copied: [$success]{cell_str[:50]}[/]")
         except IndexError:
             self.notify("Error copying cell", title="Clipboard", severity="error")
 
@@ -839,7 +857,7 @@ class DataFrameTable(DataTable):
             col_values = [str(val) for val in self.df[col_name].to_list()]
             col_str = "\n".join(col_values)
 
-            self._copy_to_clipboard(
+            self.do_copy_to_clipboard(
                 col_str,
                 f"Copied [$accent]{len(col_values)}[/] values from column [$success]{col_name}[/]",
             )
@@ -855,7 +873,7 @@ class DataFrameTable(DataTable):
             row_values = [str(val) for val in self.df.row(ridx)]
             row_str = "\t".join(row_values)
 
-            self._copy_to_clipboard(
+            self.do_copy_to_clipboard(
                 row_str,
                 f"Copied row [$accent]{ridx + 1}[/] with [$success]{len(row_values)}[/] values",
             )
@@ -865,40 +883,61 @@ class DataFrameTable(DataTable):
     def action_show_thousand_separator(self) -> None:
         """Toggle thousand separator for numeric display."""
         self.thousand_separator = not self.thousand_separator
-        self._setup_table()
+        self.setup_table()
         # status = "enabled" if self.thousand_separator else "disabled"
         # self.notify(f"Thousand separator {status}", title="Display")
 
     def action_next_match(self) -> None:
         """Go to the next matched cell."""
-        self._next_match()
+        self.do_next_match()
 
     def action_previous_match(self) -> None:
         """Go to the previous matched cell."""
-        self._previous_match()
+        self.do_previous_match()
 
     def action_next_selected_row(self) -> None:
         """Go to the next selected row."""
-        self._next_selected_row()
+        self.do_next_selected_row()
 
     def action_previous_selected_row(self) -> None:
         """Go to the previous selected row."""
-        self._previous_selected_row()
+        self.do_previous_selected_row()
 
     def action_simple_sql(self) -> None:
         """Open the SQL interface screen."""
-        self._simple_sql()
+        self.do_simple_sql()
 
     def action_advanced_sql(self) -> None:
         """Open the advanced SQL interface screen."""
-        self._advanced_sql()
+        self.do_advanced_sql()
 
     def on_mouse_scroll_down(self, event) -> None:
         """Load more rows when scrolling down with mouse."""
-        self._check_and_load_more()
+        self.check_and_load_more()
 
     # Setup & Loading
-    def _setup_table(self, reset: bool = False) -> None:
+    def reset_df(self, new_df: pl.DataFrame, dirty: bool = True) -> None:
+        """Reset the dataframe to a new one and refresh the table.
+
+        Args:
+            new_df: The new Polars DataFrame to set.
+            dirty: Whether to mark the table as dirty (unsaved changes). Defaults to True.
+        """
+        # Set new dataframe and reset table
+        self.df = new_df
+        self.loaded_rows = 0
+        self.sorted_columns = {}
+        self.hidden_columns = set()
+        self.selected_rows = [False] * len(self.df)
+        self.visible_rows = [True] * len(self.df)
+        self.fixed_rows = 0
+        self.fixed_columns = 0
+        self.matches = defaultdict(set)
+        self.histories.clear()
+        self.history = None
+        self.dirty = dirty  # Mark as dirty since data changed
+
+    def setup_table(self, reset: bool = False) -> None:
         """Setup the table for display.
 
         Row keys are 0-based indices, which map directly to dataframe row indices.
@@ -909,15 +948,7 @@ class DataFrameTable(DataTable):
 
         # Reset to original dataframe
         if reset:
-            self.df = self.dataframe
-            self.loaded_rows = 0
-            self.sorted_columns = {}
-            self.hidden_columns = set()
-            self.selected_rows = [False] * len(self.df)
-            self.visible_rows = [True] * len(self.df)
-            self.fixed_rows = 0
-            self.fixed_columns = 0
-            self.matches = defaultdict(set)
+            self.reset_df(self.dataframe, dirty=False)
 
         # Lazy load up to INITIAL_BATCH_SIZE visible rows
         stop, visible_count = self.INITIAL_BATCH_SIZE, 0
@@ -938,14 +969,14 @@ class DataFrameTable(DataTable):
         # Save current cursor position before clearing
         row_idx, col_idx = self.cursor_coordinate
 
-        self._setup_columns()
-        self._load_rows(stop)
+        self.setup_columns()
+        self.load_rows(stop)
 
         # Restore cursor position
         if row_idx < len(self.rows) and col_idx < len(self.columns):
             self.move_cursor(row=row_idx, column=col_idx)
 
-    def _determine_column_widths(self) -> dict[str, int]:
+    def determine_column_widths(self) -> dict[str, int]:
         """Determine optimal width for each column based on data type and content.
 
         For String columns:
@@ -1015,7 +1046,7 @@ class DataFrameTable(DataTable):
 
         return column_widths
 
-    def _setup_columns(self) -> None:
+    def setup_columns(self) -> None:
         """Clear table and setup columns.
 
         Column keys are header names from the dataframe.
@@ -1024,7 +1055,7 @@ class DataFrameTable(DataTable):
         self.clear(columns=True)
 
         # Get optimal column widths
-        column_widths = self._determine_column_widths()
+        column_widths = self.determine_column_widths()
 
         # Add columns with justified headers
         for col, dtype in zip(self.df.columns, self.df.dtypes):
@@ -1047,7 +1078,7 @@ class DataFrameTable(DataTable):
 
             self.add_column(Text(cell_value, justify=DtypeConfig(dtype).justify), key=col, width=width)
 
-    def _load_rows(self, stop: int | None = None, move_to_end: bool = False) -> None:
+    def load_rows(self, stop: int | None = None, move_to_end: bool = False) -> None:
         """Load a batch of rows into the table (synchronous wrapper).
 
         Args:
@@ -1069,7 +1100,7 @@ class DataFrameTable(DataTable):
 
             def _continue(result: bool) -> None:
                 if result:
-                    self._load_rows_async(stop, move_to_end=move_to_end)
+                    self.load_rows_async(stop, move_to_end=move_to_end)
 
             self.app.push_screen(
                 ConfirmScreen(
@@ -1082,10 +1113,10 @@ class DataFrameTable(DataTable):
             return
 
         # Load rows asynchronously
-        self._load_rows_async(stop, move_to_end=move_to_end)
+        self.load_rows_async(stop, move_to_end=move_to_end)
 
     @work(exclusive=True, description="Loading rows...")
-    async def _load_rows_async(self, stop: int, move_to_end: bool = False) -> None:
+    async def load_rows_async(self, stop: int, move_to_end: bool = False) -> None:
         """Perform loading with async to avoid blocking.
 
         Args:
@@ -1099,19 +1130,19 @@ class DataFrameTable(DataTable):
             # Load max BATCH_SIZE rows at a time
             chunk_size = min(self.BATCH_SIZE, stop - self.loaded_rows)
             next_stop = min(self.loaded_rows + chunk_size, stop)
-            self._load_rows_batch(next_stop)
+            self.load_rows_batch(next_stop)
 
             # If there's more to load, yield to event loop with delay
             if next_stop < stop:
                 await sleep_async(0.05)  # 50ms delay to allow UI updates
-                self._load_rows_async(stop, move_to_end=move_to_end)
+                self.load_rows_async(stop, move_to_end=move_to_end)
                 return
 
         # After loading completes, move cursor to end if requested
         if move_to_end:
             self.call_after_refresh(lambda: self.move_cursor(row=self.row_count - 1))
 
-    def _load_rows_batch(self, stop: int) -> None:
+    def load_rows_batch(self, stop: int) -> None:
         """Load a batch of rows into the table.
 
         Row keys are 0-based indices as strings, which map directly to dataframe row indices.
@@ -1157,7 +1188,7 @@ class DataFrameTable(DataTable):
             self.notify("Error loading rows", title="Load", severity="error")
             self.log(f"Error loading rows: {str(e)}")
 
-    def _check_and_load_more(self) -> None:
+    def check_and_load_more(self) -> None:
         """Check if we need to load more rows and load them."""
         # If we've loaded everything, no need to check
         if self.loaded_rows >= len(self.df):
@@ -1168,10 +1199,10 @@ class DataFrameTable(DataTable):
 
         # If visible area is close to the end of loaded rows, load more
         if bottom_visible_row >= self.loaded_rows - 10:
-            self._load_rows(self.loaded_rows + self.BATCH_SIZE)
+            self.load_rows(self.loaded_rows + self.BATCH_SIZE)
 
     # Highlighting
-    def _do_highlight(self, force: bool = False) -> None:
+    def apply_highlight(self, force: bool = False) -> None:
         """Update all rows, highlighting selected ones and restoring others to default.
 
         Args:
@@ -1181,10 +1212,10 @@ class DataFrameTable(DataTable):
         stop = rindex(self.selected_rows, True) + 1
         stop = max(stop, max(self.matches.keys(), default=0) + 1)
 
-        self._load_rows(stop)
-        self._highlight_table(force)
+        self.load_rows(stop)
+        self.highlight_table(force)
 
-    def _highlight_table(self, force: bool = False) -> None:
+    def highlight_table(self, force: bool = False) -> None:
         """Highlight selected rows/cells in red."""
         if not force and not any(self.selected_rows) and not self.matches:
             return  # Nothing to highlight
@@ -1221,7 +1252,7 @@ class DataFrameTable(DataTable):
                     self.update_cell(row.key, col.key, cell_text)
 
     # History & Undo
-    def _create_history(self, description: str) -> None:
+    def create_history(self, description: str) -> None:
         """Create the initial history state."""
         return History(
             description=description,
@@ -1236,9 +1267,10 @@ class DataFrameTable(DataTable):
             fixed_columns=self.fixed_columns,
             cursor_coordinate=self.cursor_coordinate,
             matches={k: v.copy() for k, v in self.matches.items()},
+            dirty=self.dirty,
         )
 
-    def _apply_history(self, history: History) -> None:
+    def apply_history(self, history: History) -> None:
         """Apply the current history state to the table."""
         if history is None:
             return
@@ -1255,20 +1287,26 @@ class DataFrameTable(DataTable):
         self.fixed_columns = history.fixed_columns
         self.cursor_coordinate = history.cursor_coordinate
         self.matches = {k: v.copy() for k, v in history.matches.items()} if history.matches else defaultdict(set)
+        self.dirty = history.dirty
 
         # Recreate table for display
-        self._setup_table()
+        self.setup_table()
 
-    def _add_history(self, description: str) -> None:
+    def add_history(self, description: str, dirty: bool = False) -> None:
         """Add the current state to the history stack.
 
         Args:
             description: Description of the action for this history entry.
+            dirty: Whether this operation modifies the data (True) or just display state (False).
         """
-        history = self._create_history(description)
+        history = self.create_history(description)
         self.histories.append(history)
 
-    def _undo(self) -> None:
+        # Mark table as dirty if this operation modifies data
+        if dirty:
+            self.dirty = True
+
+    def do_undo(self) -> None:
         """Undo the last action."""
         if not self.histories:
             self.notify("No actions to undo", title="Undo", severity="warning")
@@ -1278,14 +1316,14 @@ class DataFrameTable(DataTable):
         history = self.histories.pop()
 
         # Save current state for redo
-        self.history = self._create_history(history.description)
+        self.history = self.create_history(history.description)
 
         # Restore state
-        self._apply_history(history)
+        self.apply_history(history)
 
         self.notify(f"Reverted: {history.description}", title="Undo")
 
-    def _redo(self) -> None:
+    def do_redo(self) -> None:
         """Redo the last undone action."""
         if self.history is None:
             self.notify("No actions to redo", title="Redo", severity="warning")
@@ -1294,39 +1332,51 @@ class DataFrameTable(DataTable):
         description = self.history.description
 
         # Save current state for undo
-        self._add_history(description)
+        self.add_history(description)
 
         # Restore state
-        self._apply_history(self.history)
+        self.apply_history(self.history)
 
         # Clear redo state
         self.history = None
 
         self.notify(f"Reapplied: {description}", title="Redo")
 
+    def do_reset(self) -> None:
+        """Reset the table to the initial state."""
+        self.setup_table(reset=True)
+        self.notify("Restored initial state", title="Reset")
+
+    def restore_dirty(self, default: bool | None = None) -> None:
+        """Restore the dirty state from the last history entry."""
+        if self.last_history:
+            self.dirty = self.last_history.dirty
+        elif default is not None:
+            self.dirty = default
+
     # Display
-    def _cycle_cursor_type(self) -> None:
+    def do_cycle_cursor_type(self) -> None:
         """Cycle through cursor types: cell -> row -> column -> cell."""
         next_type = get_next_item(CURSOR_TYPES, self.cursor_type)
         self.cursor_type = next_type
 
         # self.notify(f"Changed cursor type to [$success]{next_type}[/]", title="Cursor")
 
-    def _view_row_detail(self) -> None:
+    def do_view_row_detail(self) -> None:
         """Open a modal screen to view the selected row's details."""
         ridx = self.cursor_row_idx
 
         # Push the modal screen
         self.app.push_screen(RowDetailScreen(ridx, self))
 
-    def _show_frequency(self) -> None:
+    def do_show_frequency(self) -> None:
         """Show frequency distribution for the current column."""
         cidx = self.cursor_col_idx
 
         # Push the frequency modal screen
         self.app.push_screen(FrequencyScreen(cidx, self))
 
-    def _show_statistics(self, scope: str = "column") -> None:
+    def do_show_statistics(self, scope: str = "column") -> None:
         """Show statistics for the current column or entire dataframe.
 
         Args:
@@ -1340,11 +1390,11 @@ class DataFrameTable(DataTable):
             cidx = self.cursor_col_idx
             self.app.push_screen(StatisticsScreen(self, col_idx=cidx))
 
-    def _freeze_row_column(self) -> None:
+    def do_freeze_row_column(self) -> None:
         """Open the freeze screen to set fixed rows and columns."""
-        self.app.push_screen(FreezeScreen(), callback=self._do_freeze)
+        self.app.push_screen(FreezeScreen(), callback=self.freeze_row_column)
 
-    def _do_freeze(self, result: tuple[int, int] | None) -> None:
+    def freeze_row_column(self, result: tuple[int, int] | None) -> None:
         """Handle result from PinScreen.
 
         Args:
@@ -1356,7 +1406,7 @@ class DataFrameTable(DataTable):
         fixed_rows, fixed_columns = result
 
         # Add to history
-        self._add_history(f"Pinned [$accent]{fixed_rows}[/] rows and [$success]{fixed_columns}[/] columns")
+        self.add_history(f"Pinned [$accent]{fixed_rows}[/] rows and [$success]{fixed_columns}[/] columns")
 
         # Apply the pin settings to the table
         if fixed_rows >= 0:
@@ -1366,14 +1416,14 @@ class DataFrameTable(DataTable):
 
         # self.notify(f"Pinned [$accent]{fixed_rows}[/] rows and [$success]{fixed_columns}[/] columns", title="Pin")
 
-    def _hide_column(self) -> None:
+    def do_hide_column(self) -> None:
         """Hide the currently selected column from the table display."""
         col_key = self.cursor_col_key
         col_name = col_key.value
         col_idx = self.cursor_column
 
         # Add to history
-        self._add_history(f"Hid column [$success]{col_name}[/]")
+        self.add_history(f"Hid column [$success]{col_name}[/]")
 
         # Remove the column from the table display (but keep in dataframe)
         self.remove_column(col_key)
@@ -1387,7 +1437,7 @@ class DataFrameTable(DataTable):
 
         # self.notify(f"Hid column [$accent]{col_name}[/]. Press [$success]H[/] to show hidden columns", title="Hide")
 
-    def _expand_column(self) -> None:
+    def do_expand_column(self) -> None:
         """Expand the current column to show the widest cell in the loaded data."""
         col_idx = self.cursor_col_idx
         col_key = self.cursor_col_key
@@ -1424,7 +1474,7 @@ class DataFrameTable(DataTable):
             self.notify("Error expanding column", title="Expand", severity="error")
             self.log(f"Error expanding column `{col_name}`: {str(e)}")
 
-    def _show_hidden_rows_columns(self) -> None:
+    def do_show_hidden_rows_columns(self) -> None:
         """Show all hidden rows/columns by recreating the table."""
         # Get currently visible columns
         visible_cols = set(col.key for col in self.ordered_columns)
@@ -1437,760 +1487,761 @@ class DataFrameTable(DataTable):
             return
 
         # Add to history
-        self._add_history("Showed hidden rows/columns")
+        self.add_history("Showed hidden rows/columns")
 
         # Clear hidden rows/columns tracking
         self.visible_rows = [True] * len(self.df)
         self.hidden_columns.clear()
 
         # Recreate table for display
-        self._setup_table()
+        self.setup_table()
 
         self.notify(
             f"Showed [$accent]{hidden_row_count}[/] hidden row(s) and/or [$accent]{hidden_col_count}[/] column(s)",
             title="Show",
         )
 
-    # Delete & Move
-    def _delete_column(self, more: str = None) -> None:
-        """Remove the currently selected column from the table."""
-        # Get the column to remove
-        col_idx = self.cursor_column
-        col_name = self.cursor_col_name
-        col_key = self.cursor_col_key
-
-        col_names_to_remove = []
-        col_keys_to_remove = []
+    # Sort
+    def do_sort_by_column(self, descending: bool = False) -> None:
+        """Sort by the currently selected column.
 
-        # Remove all columns before the current column
-        if more == "before":
-            for i in range(col_idx + 1):
-                col_key = self.get_column_key(i)
-                col_names_to_remove.append(col_key.value)
-                col_keys_to_remove.append(col_key)
+        Supports multi-column sorting:
+        - First press on a column: sort by that column only
+        - Subsequent presses on other columns: add to sort order
 
-            message = f"Removed column [$success]{col_name}[/] and all columns before"
+        Args:
+            descending: If True, sort in descending order. If False, ascending order.
+        """
+        col_name = self.cursor_col_name
+        col_idx = self.cursor_column
 
-        # Remove all columns after the current column
-        elif more == "after":
-            for i in range(col_idx, len(self.columns)):
-                col_key = self.get_column_key(i)
-                col_names_to_remove.append(col_key.value)
-                col_keys_to_remove.append(col_key)
+        # Check if this column is already in the sort keys
+        old_desc = self.sorted_columns.get(col_name)
 
-            message = f"Removed column [$success]{col_name}[/] and all columns after"
+        # Add to history
+        self.add_history(f"Sorted on column [$success]{col_name}[/]", dirty=True)
+        if old_desc is None:
+            # Add new column to sort
+            self.sorted_columns[col_name] = descending
+        elif old_desc == descending:
+            # Same direction - remove from sort
+            del self.sorted_columns[col_name]
+        else:
+            # Move to end of sort order
+            del self.sorted_columns[col_name]
+            self.sorted_columns[col_name] = descending
 
-        # Remove only the current column
+        # Apply multi-column sort
+        if sort_cols := list(self.sorted_columns.keys()):
+            descending_flags = list(self.sorted_columns.values())
+            df_sorted = self.df.with_row_index(RIDX).sort(sort_cols, descending=descending_flags, nulls_last=True)
         else:
-            col_names_to_remove.append(col_name)
-            col_keys_to_remove.append(col_key)
-            message = f"Removed column [$success]{col_name}[/]"
+            # No sort columns - restore original order
+            df_sorted = self.df.with_row_index(RIDX)
 
-        # Add to history
-        self._add_history(message)
+        # Updated selected_rows and visible_rows to match new order
+        old_row_indices = df_sorted[RIDX].to_list()
+        self.selected_rows = [self.selected_rows[i] for i in old_row_indices]
+        self.visible_rows = [self.visible_rows[i] for i in old_row_indices]
 
-        # Remove the columns from the table display using the column names as keys
-        for ck in col_keys_to_remove:
-            self.remove_column(ck)
+        # Update the dataframe
+        self.df = df_sorted.drop(RIDX)
 
-        # Move cursor left if we deleted the last column(s)
-        last_col_idx = len(self.columns) - 1
-        if col_idx > last_col_idx:
-            self.move_cursor(column=last_col_idx)
+        # Recreate table for display
+        self.setup_table()
 
-        # Remove from sorted columns if present
-        for col_name in col_names_to_remove:
-            if col_name in self.sorted_columns:
-                del self.sorted_columns[col_name]
+        # Restore cursor position on the sorted column
+        self.move_cursor(column=col_idx, row=0)
 
-        # Remove from matches
-        col_indices_to_remove = set(self.df.columns.index(name) for name in col_names_to_remove)
-        for row_idx in list(self.matches.keys()):
-            self.matches[row_idx].difference_update(col_indices_to_remove)
-            # Remove empty entries
-            if not self.matches[row_idx]:
-                del self.matches[row_idx]
+    # Edit
+    def do_edit_cell(self, ridx: int = None, cidx: int = None) -> None:
+        """Open modal to edit the selected cell."""
+        ridx = self.cursor_row_idx if ridx is None else ridx
+        cidx = self.cursor_col_idx if cidx is None else cidx
 
-        # Remove from dataframe
-        self.df = self.df.drop(col_names_to_remove)
+        # Push the edit modal screen
+        self.app.push_screen(
+            EditCellScreen(ridx, cidx, self.df),
+            callback=self.edit_cell,
+        )
 
-        self.notify(message, title="Delete")
+    def edit_cell(self, result) -> None:
+        """Handle result from EditCellScreen."""
+        if result is None:
+            return
 
-    def _duplicate_column(self) -> None:
-        """Duplicate the currently selected column, inserting it right after the current column."""
-        cidx = self.cursor_col_idx
-        col_name = self.cursor_col_name
+        ridx, cidx, new_value = result
+        if new_value is None:
+            self.app.push_screen(
+                EditCellScreen(ridx, cidx, self.df),
+                callback=self.edit_cell,
+            )
+            return
 
-        col_idx = self.cursor_column
-        new_col_name = f"{col_name}_copy"
+        col_name = self.df.columns[cidx]
 
         # Add to history
-        self._add_history(f"Duplicated column [$success]{col_name}[/]")
-
-        # Create new column and reorder columns to insert after current column
-        cols_before = self.df.columns[: cidx + 1]
-        cols_after = self.df.columns[cidx + 1 :]
-
-        # Add the new column and reorder columns for insertion after current column
-        self.df = self.df.with_columns(pl.col(col_name).alias(new_col_name)).select(
-            list(cols_before) + [new_col_name] + list(cols_after)
-        )
+        self.add_history(f"Edited cell [$success]({ridx + 1}, {col_name})[/]", dirty=True)
 
-        # Update matches to account for new column
-        new_matches = defaultdict(set)
-        for row_idx, cols in self.matches.items():
-            new_cols = set()
-            for col_idx_in_set in cols:
-                if col_idx_in_set <= cidx:
-                    new_cols.add(col_idx_in_set)
-                else:
-                    new_cols.add(col_idx_in_set + 1)
-            new_matches[row_idx] = new_cols
-        self.matches = new_matches
+        # Update the cell in the dataframe
+        try:
+            self.df = self.df.with_columns(
+                pl.when(pl.arange(0, len(self.df)) == ridx)
+                .then(pl.lit(new_value))
+                .otherwise(pl.col(col_name))
+                .alias(col_name)
+            )
 
-        # Recreate table for display
-        self._setup_table()
+            # Update the display
+            cell_value = self.df.item(ridx, cidx)
+            if cell_value is None:
+                cell_value = NULL_DISPLAY
+            dtype = self.df.dtypes[cidx]
+            dc = DtypeConfig(dtype)
+            formatted_value = Text(str(cell_value), style=dc.style, justify=dc.justify)
 
-        # Move cursor to the new duplicated column
-        self.move_cursor(column=col_idx + 1)
+            # string as keys
+            row_key = str(ridx)
+            col_key = col_name
+            self.update_cell(row_key, col_key, formatted_value, update_width=True)
 
-        # self.notify(f"Duplicated column [$accent]{col_name}[/] as [$success]{new_col_name}[/]", title="Duplicate")
+            # self.notify(f"Cell updated to [$success]{cell_value}[/]", title="Edit")
+        except Exception as e:
+            self.notify("Error updating cell", title="Edit", severity="error")
+            self.log(f"Error updating cell: {str(e)}")
 
-    def _delete_row(self, more: str = None) -> None:
-        """Delete rows from the table and dataframe.
+    def do_edit_column(self) -> None:
+        """Open modal to edit the entire column with an expression."""
+        cidx = self.cursor_col_idx
 
-        Supports deleting multiple selected rows. If no rows are selected, deletes the row at the cursor.
-        """
-        old_count = len(self.df)
-        predicates = [True] * len(self.df)
+        # Push the edit column modal screen
+        self.app.push_screen(
+            EditColumnScreen(cidx, self.df),
+            callback=self.edit_column,
+        )
 
-        # Delete all selected rows
-        if selected_count := self.selected_rows.count(True):
-            history_desc = f"Deleted {selected_count} selected row(s)"
+    def edit_column(self, result) -> None:
+        """Edit a column."""
+        if result is None:
+            return
+        term, cidx = result
 
-            for ridx, selected in enumerate(self.selected_rows):
-                if selected:
-                    predicates[ridx] = False
+        col_name = self.df.columns[cidx]
 
-        # Delete current row and those above
-        elif more == "above":
-            ridx = self.cursor_row_idx
-            history_desc = f"Deleted current row [$success]{ridx + 1}[/] and those above"
-            for i in range(ridx + 1):
-                predicates[i] = False
+        # Null case
+        if term is None or term == NULL:
+            expr = pl.lit(None)
 
-        # Delete current row and those below
-        elif more == "below":
-            ridx = self.cursor_row_idx
-            history_desc = f"Deleted current row [$success]{ridx + 1}[/] and those below"
-            for i in range(ridx, len(self.df)):
-                if self.visible_rows[i]:
-                    predicates[i] = False
+        # Check if term is a valid expression
+        elif tentative_expr(term):
+            try:
+                expr = validate_expr(term, self.df.columns, cidx)
+            except Exception as e:
+                self.notify(f"Error validating expression [$error]{term}[/]", title="Edit", severity="error")
+                self.log(f"Error validating expression `{term}`: {str(e)}")
+                return
 
-        # Delete the row at the cursor
+        # Otherwise, treat term as a literal value
         else:
-            ridx = self.cursor_row_idx
-            history_desc = f"Deleted row [$success]{ridx + 1}[/]"
-            if self.visible_rows[ridx]:
-                predicates[ridx] = False
+            dtype = self.df.dtypes[cidx]
+            try:
+                value = DtypeConfig(dtype).convert(term)
+                expr = pl.lit(value)
+            except Exception:
+                self.notify(
+                    f"Error converting [$accent]{term}[/] to [$error]{dtype}[/]. Cast to string.",
+                    title="Edit",
+                    severity="error",
+                )
+                expr = pl.lit(str(term))
 
         # Add to history
-        self._add_history(history_desc)
+        self.add_history(f"Edited column [$accent]{col_name}[/] with expression", dirty=True)
 
-        # Apply the filter to remove rows
         try:
-            df = self.df.with_row_index(RIDX).filter(predicates)
+            # Apply the expression to the column
+            self.df = self.df.with_columns(expr.alias(col_name))
         except Exception as e:
-            self.notify(f"Error deleting row(s): {e}", title="Delete", severity="error")
-            self.histories.pop()  # Remove last history entry
+            self.notify(
+                f"Error applying expression: [$error]{term}[/] to column [$accent]{col_name}[/]",
+                title="Edit",
+                severity="error",
+            )
+            self.log(f"Error applying expression `{term}` to column `{col_name}`: {str(e)}")
             return
 
-        self.df = df.drop(RIDX)
-
-        # Update selected and visible rows tracking
-        old_row_indices = set(df[RIDX].to_list())
-        self.selected_rows = [selected for i, selected in enumerate(self.selected_rows) if i in old_row_indices]
-        self.visible_rows = [visible for i, visible in enumerate(self.visible_rows) if i in old_row_indices]
+        # Recreate table for display
+        self.setup_table()
 
-        # Clear all matches since row indices have changed
-        self.matches = defaultdict(set)
+        # self.notify(f"Column [$accent]{col_name}[/] updated with [$success]{expr}[/]", title="Edit")
 
-        # Recreate table for display
-        self._setup_table()
+    def do_rename_column(self) -> None:
+        """Open modal to rename the selected column."""
+        col_name = self.cursor_col_name
+        col_idx = self.cursor_column
 
-        deleted_count = old_count - len(self.df)
-        if deleted_count > 0:
-            self.notify(f"Deleted [$accent]{deleted_count}[/] row(s)", title="Delete")
+        # Push the rename column modal screen
+        self.app.push_screen(
+            RenameColumnScreen(col_idx, col_name, self.df.columns),
+            callback=self.rename_column,
+        )
 
-    def _duplicate_row(self) -> None:
-        """Duplicate the currently selected row, inserting it right after the current row."""
-        ridx = self.cursor_row_idx
+    def rename_column(self, result) -> None:
+        """Handle result from RenameColumnScreen."""
+        if result is None:
+            return
 
-        # Get the row to duplicate
-        row_to_duplicate = self.df.slice(ridx, 1)
+        col_idx, col_name, new_name = result
+        if new_name is None:
+            self.app.push_screen(
+                RenameColumnScreen(col_idx, col_name, self.df.columns),
+                callback=self.rename_column,
+            )
+            return
 
         # Add to history
-        self._add_history(f"Duplicated row [$success]{ridx + 1}[/]")
-
-        # Concatenate: rows before + duplicated row + rows after
-        df_before = self.df.slice(0, ridx + 1)
-        df_after = self.df.slice(ridx + 1)
+        self.add_history(f"Renamed column [$accent]{col_name}[/] to [$success]{new_name}[/]", dirty=True)
 
-        # Combine the parts
-        self.df = pl.concat([df_before, row_to_duplicate, df_after])
+        # Rename the column in the dataframe
+        self.df = self.df.rename({col_name: new_name})
 
-        # Update selected and visible rows tracking to account for new row
-        new_selected_rows = self.selected_rows[: ridx + 1] + [self.selected_rows[ridx]] + self.selected_rows[ridx + 1 :]
-        new_visible_rows = self.visible_rows[: ridx + 1] + [self.visible_rows[ridx]] + self.visible_rows[ridx + 1 :]
-        self.selected_rows = new_selected_rows
-        self.visible_rows = new_visible_rows
+        # Update sorted_columns if this column was sorted
+        if col_name in self.sorted_columns:
+            self.sorted_columns[new_name] = self.sorted_columns.pop(col_name)
 
-        # Update matches to account for new row
-        new_matches = defaultdict(set)
-        for row_idx, cols in self.matches.items():
-            if row_idx <= ridx:
-                new_matches[row_idx] = cols
-            else:
-                new_matches[row_idx + 1] = cols
-        self.matches = new_matches
+        # Update hidden_columns if this column was hidden
+        if col_name in self.hidden_columns:
+            self.hidden_columns.remove(col_name)
+            self.hidden_columns.add(new_name)
 
         # Recreate table for display
-        self._setup_table()
-
-        # Move cursor to the new duplicated row
-        self.move_cursor(row=ridx + 1)
+        self.setup_table()
 
-        # self.notify(f"Duplicated row [$success]{ridx + 1}[/]", title="Row")
+        # Move cursor to the renamed column
+        self.move_cursor(column=col_idx)
 
-    def _move_column(self, direction: str) -> None:
-        """Move the current column left or right.
+        # self.notify(f"Renamed column [$success]{col_name}[/] to [$success]{new_name}[/]", title="Column")
 
-        Args:
-            direction: "left" to move left, "right" to move right.
-        """
-        row_idx, col_idx = self.cursor_coordinate
-        col_key = self.cursor_col_key
-        col_name = col_key.value
+    def do_clear_cell(self) -> None:
+        """Clear the current cell by setting its value to None."""
+        row_key, col_key = self.cursor_key
+        ridx = self.cursor_row_idx
         cidx = self.cursor_col_idx
-
-        # Validate move is possible
-        if direction == "left":
-            if col_idx <= 0:
-                self.notify("Cannot move column left", title="Move", severity="warning")
-                return
-            swap_idx = col_idx - 1
-        elif direction == "right":
-            if col_idx >= len(self.columns) - 1:
-                self.notify("Cannot move column right", title="Move", severity="warning")
-                return
-            swap_idx = col_idx + 1
-
-        # Get column to swap
-        _, swap_key = self.coordinate_to_cell_key(Coordinate(row_idx, swap_idx))
-        swap_name = swap_key.value
-        swap_cidx = self.df.columns.index(swap_name)
+        col_name = self.cursor_col_name
 
         # Add to history
-        self._add_history(f"Moved column [$success]{col_name}[/] {direction} (swapped with [$success]{swap_name}[/])")
-
-        # Swap columns in the table's internal column locations
-        self.check_idle()
-
-        (
-            self._column_locations[col_key],
-            self._column_locations[swap_key],
-        ) = (
-            self._column_locations.get(swap_key),
-            self._column_locations.get(col_key),
-        )
-
-        self._update_count += 1
-        self.refresh()
+        self.add_history(f"Cleared cell [$success]({ridx + 1}, {col_name})[/]", dirty=True)
 
-        # Restore cursor position on the moved column
-        self.move_cursor(row=row_idx, column=swap_idx)
+        # Update the cell to None in the dataframe
+        try:
+            self.df = self.df.with_columns(
+                pl.when(pl.arange(0, len(self.df)) == ridx)
+                .then(pl.lit(None))
+                .otherwise(pl.col(col_name))
+                .alias(col_name)
+            )
 
-        # Update the dataframe column order
-        cols = list(self.df.columns)
-        cols[cidx], cols[swap_cidx] = cols[swap_cidx], cols[cidx]
-        self.df = self.df.select(cols)
+            # Update the display
+            dtype = self.df.dtypes[cidx]
+            dc = DtypeConfig(dtype)
+            formatted_value = Text(NULL_DISPLAY, style=dc.style, justify=dc.justify)
 
-        # self.notify(f"Moved column [$success]{col_name}[/] {direction}", title="Move")
+            self.update_cell(row_key, col_key, formatted_value)
 
-    def _move_row(self, direction: str) -> None:
-        """Move the current row up or down.
+            # self.notify(f"Cell cleared to [$success]{NULL_DISPLAY}[/]", title="Clear")
+        except Exception as e:
+            self.notify("Error clearing cell", title="Clear", severity="error")
+            self.log(f"Error clearing cell: {str(e)}")
+            raise e
 
-        Args:
-            direction: "up" to move up, "down" to move down.
-        """
-        row_idx, col_idx = self.cursor_coordinate
+    def do_add_column(self, col_name: str = None, col_value: pl.Expr = None) -> None:
+        """Add acolumn after the current column."""
+        cidx = self.cursor_col_idx
 
-        # Validate move is possible
-        if direction == "up":
-            if row_idx <= 0:
-                self.notify("Cannot move row up", title="Move", severity="warning")
-                return
-            swap_idx = row_idx - 1
-        elif direction == "down":
-            if row_idx >= len(self.rows) - 1:
-                self.notify("Cannot move row down", title="Move", severity="warning")
-                return
-            swap_idx = row_idx + 1
+        if not col_name:
+            # Generate a unique column name
+            base_name = "new_col"
+            new_name = base_name
+            counter = 1
+            while new_name in self.df.columns:
+                new_name = f"{base_name}_{counter}"
+                counter += 1
         else:
-            # Invalid direction
-            return
-
-        row_key = self.coordinate_to_cell_key((row_idx, 0)).row_key
-        swap_key = self.coordinate_to_cell_key((swap_idx, 0)).row_key
+            new_name = col_name
 
         # Add to history
-        self._add_history(
-            f"Moved row [$success]{row_key.value}[/] {direction} (swapped with row [$success]{swap_key.value}[/])"
-        )
+        self.add_history(f"Added column [$success]{new_name}[/] after column {cidx + 1}", dirty=True)
 
-        # Swap rows in the table's internal row locations
-        self.check_idle()
+        try:
+            # Create an empty column (all None values)
+            if isinstance(col_value, pl.Expr):
+                new_col = col_value.alias(new_name)
+            else:
+                new_col = pl.lit(col_value).alias(new_name)
 
-        (
-            self._row_locations[row_key],
-            self._row_locations[swap_key],
-        ) = (
-            self._row_locations.get(swap_key),
-            self._row_locations.get(row_key),
-        )
+            # Get columns up to current, the new column, then remaining columns
+            cols = self.df.columns
+            cols_before = cols[: cidx + 1]
+            cols_after = cols[cidx + 1 :]
 
-        self._update_count += 1
-        self.refresh()
+            # Build the new dataframe with columns reordered
+            select_cols = cols_before + [new_name] + cols_after
+            self.df = self.df.with_columns(new_col).select(select_cols)
 
-        # Restore cursor position on the moved row
-        self.move_cursor(row=swap_idx, column=col_idx)
+            # Recreate table for display
+            self.setup_table()
 
-        # Swap rows in the dataframe
-        ridx = int(row_key.value)  # 0-based
-        swap_ridx = int(swap_key.value)  # 0-based
-        first, second = sorted([ridx, swap_ridx])
+            # Move cursor to the new column
+            self.move_cursor(column=cidx + 1)
 
-        self.df = pl.concat(
-            [
-                self.df.slice(0, first),
-                self.df.slice(second, 1),
-                self.df.slice(first + 1, second - first - 1),
-                self.df.slice(first, 1),
-                self.df.slice(second + 1),
-            ]
+            # self.notify(f"Added column [$success]{new_name}[/]", title="Add Column")
+        except Exception as e:
+            self.notify("Error adding column", title="Add Column", severity="error")
+            self.log(f"Error adding column: {str(e)}")
+            raise e
+
+    def do_add_column_expr(self) -> None:
+        """Open screen to add a new column with optional expression."""
+        cidx = self.cursor_col_idx
+        self.app.push_screen(
+            AddColumnScreen(cidx, self.df),
+            self.add_column_expr,
         )
 
-        # self.notify(f"Moved row [$success]{row_key.value}[/] {direction}", title="Move")
+    def add_column_expr(self, result: tuple[int, str, str, pl.Expr] | None) -> None:
+        """Add a new column with an expression."""
+        if result is None:
+            return
 
-    # Sort
-    def _sort_by_column(self, descending: bool = False) -> None:
-        """Sort by the currently selected column.
-
-        Supports multi-column sorting:
-        - First press on a column: sort by that column only
-        - Subsequent presses on other columns: add to sort order
-
-        Args:
-            descending: If True, sort in descending order. If False, ascending order.
-        """
-        col_name = self.cursor_col_name
-        col_idx = self.cursor_column
-
-        # Check if this column is already in the sort keys
-        old_desc = self.sorted_columns.get(col_name)
+        cidx, new_col_name, expr = result
 
         # Add to history
-        self._add_history(f"Sorted on column [$success]{col_name}[/]")
-        if old_desc is None:
-            # Add new column to sort
-            self.sorted_columns[col_name] = descending
-        elif old_desc == descending:
-            # Same direction - remove from sort
-            del self.sorted_columns[col_name]
-        else:
-            # Move to end of sort order
-            del self.sorted_columns[col_name]
-            self.sorted_columns[col_name] = descending
+        self.add_history(f"Added column [$success]{new_col_name}[/] with expression {expr}.", dirty=True)
 
-        # Apply multi-column sort
-        if sort_cols := list(self.sorted_columns.keys()):
-            descending_flags = list(self.sorted_columns.values())
-            df_sorted = self.df.with_row_index(RIDX).sort(sort_cols, descending=descending_flags, nulls_last=True)
-        else:
-            # No sort columns - restore original order
-            df_sorted = self.df.with_row_index(RIDX)
-
-        # Updated selected_rows and visible_rows to match new order
-        old_row_indices = df_sorted[RIDX].to_list()
-        self.selected_rows = [self.selected_rows[i] for i in old_row_indices]
-        self.visible_rows = [self.visible_rows[i] for i in old_row_indices]
+        try:
+            # Create the column
+            new_col = expr.alias(new_col_name)
 
-        # Update the dataframe
-        self.df = df_sorted.drop(RIDX)
+            # Get columns up to current, the new column, then remaining columns
+            cols = self.df.columns
+            cols_before = cols[: cidx + 1]
+            cols_after = cols[cidx + 1 :]
 
-        # Recreate table for display
-        self._setup_table()
+            # Build the new dataframe with columns reordered
+            select_cols = cols_before + [new_col_name] + cols_after
+            self.df = self.df.with_row_index(RIDX).with_columns(new_col).select(select_cols)
 
-        # Restore cursor position on the sorted column
-        self.move_cursor(column=col_idx, row=0)
+            # Recreate table for display
+            self.setup_table()
 
-    # Edit
-    def _edit_cell(self, ridx: int = None, cidx: int = None) -> None:
-        """Open modal to edit the selected cell."""
-        ridx = self.cursor_row_idx if ridx is None else ridx
-        cidx = self.cursor_col_idx if cidx is None else cidx
-        col_name = self.df.columns[cidx]
+            # Move cursor to the new column
+            self.move_cursor(column=cidx + 1)
 
-        # Add to history
-        self._add_history(f"Edited cell [$success]({ridx + 1}, {col_name})[/]")
+            # self.notify(f"Added column [$success]{col_name}[/]", title="Add Column")
+        except Exception as e:
+            self.notify("Error adding column", title="Add Column", severity="error")
+            self.log(f"Error adding column `{new_col_name}`: {str(e)}")
 
-        # Push the edit modal screen
+    def do_add_link_column(self) -> None:
         self.app.push_screen(
-            EditCellScreen(ridx, cidx, self.df),
-            callback=self._do_edit_cell,
+            AddLinkScreen(self.cursor_col_idx, self.df),
+            callback=self.add_link_column,
         )
 
-    def _do_edit_cell(self, result) -> None:
-        """Handle result from EditCellScreen."""
-        if result is None:
-            return
+    def add_link_column(self, result: tuple[str, str] | None) -> None:
+        """Handle result from AddLinkScreen.
 
-        ridx, cidx, new_value = result
-        if new_value is None:
-            self.app.push_screen(
-                EditCellScreen(ridx, cidx, self.df),
-                callback=self._do_edit_cell,
-            )
+        Creates a new link column in the dataframe with clickable links based on a
+        user-provided template. Supports multiple placeholder types:
+        - `$_` - Current column (based on cursor position)
+        - `$1`, `$2`, etc. - Column by 1-based position index
+        - `$name` - Column by name (e.g., `$id`, `$product_name`)
+
+        The template is evaluated for each row using Polars expressions with vectorized
+        string concatenation. The new column is inserted after the current column.
+
+        Args:
+            result: Tuple of (cidx, new_col_name, link_template) or None if cancelled.
+        """
+        if result is None:
             return
+        cidx, new_col_name, link_template = result
 
-        col_name = self.df.columns[cidx]
+        self.add_history(
+            f"Added link column [$accent]{new_col_name}[/] with template [$success]{link_template}[/].", dirty=True
+        )
 
-        # Update the cell in the dataframe
         try:
-            self.df = self.df.with_columns(
-                pl.when(pl.arange(0, len(self.df)) == ridx)
-                .then(pl.lit(new_value))
-                .otherwise(pl.col(col_name))
-                .alias(col_name)
-            )
+            # Hack to support PubChem link
+            link_template = link_template.replace("PC", "pubchem.ncbi.nlm.nih.gov")
 
-            # Update the display
-            cell_value = self.df.item(ridx, cidx)
-            if cell_value is None:
-                cell_value = NULL_DISPLAY
-            dtype = self.df.dtypes[cidx]
-            dc = DtypeConfig(dtype)
-            formatted_value = Text(str(cell_value), style=dc.style, justify=dc.justify)
+            # Ensure link starts with http:// or https://
+            if not link_template.startswith(("https://", "http://")):
+                link_template = "https://" + link_template
 
-            # string as keys
-            row_key = str(ridx)
-            col_key = col_name
-            self.update_cell(row_key, col_key, formatted_value, update_width=True)
+            # Parse template placeholders into Polars expressions
+            parts = parse_placeholders(link_template, self.df.columns, cidx)
+
+            # Build the concatenation expression
+            exprs = [part if isinstance(part, pl.Expr) else pl.lit(part) for part in parts]
+            new_col = pl.concat_str(exprs).alias(new_col_name)
+
+            # Get columns up to current, the new column, then remaining columns
+            cols = self.df.columns
+            cols_before = cols[: cidx + 1]
+            cols_after = cols[cidx + 1 :]
+
+            # Build the new dataframe with columns reordered
+            select_cols = cols_before + [new_col_name] + cols_after
+            self.df = self.df.with_columns(new_col).select(select_cols)
+
+            # Recreate table for display
+            self.setup_table()
+
+            # Move cursor to the new column
+            self.move_cursor(column=cidx + 1)
+
+            self.notify(f"Added link column [$success]{new_col_name}[/]. Use Ctrl/Cmd click to open.", title="Add Link")
 
-            # self.notify(f"Cell updated to [$success]{cell_value}[/]", title="Edit")
         except Exception as e:
-            self.notify("Error updating cell", title="Edit", severity="error")
-            self.log(f"Error updating cell: {str(e)}")
+            self.notify(f"Error adding link column [$error]{new_col_name}[/]", title="Add Link", severity="error")
+            self.log(f"Error adding link column: {str(e)}")
 
-    def _edit_column(self) -> None:
-        """Open modal to edit the entire column with an expression."""
-        cidx = self.cursor_col_idx
+    def do_delete_column(self, more: str = None) -> None:
+        """Remove the currently selected column from the table."""
+        # Get the column to remove
+        col_idx = self.cursor_column
+        col_name = self.cursor_col_name
+        col_key = self.cursor_col_key
 
-        # Push the edit column modal screen
-        self.app.push_screen(
-            EditColumnScreen(cidx, self.df),
-            callback=self._do_edit_column,
-        )
+        col_names_to_remove = []
+        col_keys_to_remove = []
 
-    def _do_edit_column(self, result) -> None:
-        """Edit a column."""
-        if result is None:
-            return
-        term, cidx = result
+        # Remove all columns before the current column
+        if more == "before":
+            for i in range(col_idx + 1):
+                col_key = self.get_column_key(i)
+                col_names_to_remove.append(col_key.value)
+                col_keys_to_remove.append(col_key)
 
-        col_name = self.df.columns[cidx]
+            message = f"Removed column [$success]{col_name}[/] and all columns before"
 
-        # Null case
-        if term is None or term == NULL:
-            expr = pl.lit(None)
+        # Remove all columns after the current column
+        elif more == "after":
+            for i in range(col_idx, len(self.columns)):
+                col_key = self.get_column_key(i)
+                col_names_to_remove.append(col_key.value)
+                col_keys_to_remove.append(col_key)
 
-        # Check if term is a valid expression
-        elif tentative_expr(term):
-            try:
-                expr = validate_expr(term, self.df.columns, cidx)
-            except Exception as e:
-                self.notify(f"Error validating expression [$error]{term}[/]", title="Edit", severity="error")
-                self.log(f"Error validating expression `{term}`: {str(e)}")
-                return
+            message = f"Removed column [$success]{col_name}[/] and all columns after"
 
-        # Otherwise, treat term as a literal value
+        # Remove only the current column
         else:
-            dtype = self.df.dtypes[cidx]
-            try:
-                value = DtypeConfig(dtype).convert(term)
-                expr = pl.lit(value)
-            except Exception:
-                self.notify(
-                    f"Error converting [$accent]{term}[/] to [$error]{dtype}[/]. Cast to string.",
-                    title="Edit",
-                    severity="error",
-                )
-                expr = pl.lit(str(term))
+            col_names_to_remove.append(col_name)
+            col_keys_to_remove.append(col_key)
+            message = f"Removed column [$success]{col_name}[/]"
 
         # Add to history
-        self._add_history(f"Edited column [$accent]{col_name}[/] with expression")
+        self.add_history(message, dirty=True)
 
-        try:
-            # Apply the expression to the column
-            self.df = self.df.with_columns(expr.alias(col_name))
-        except Exception as e:
-            self.notify(
-                f"Error applying expression: [$error]{term}[/] to column [$accent]{col_name}[/]",
-                title="Edit",
-                severity="error",
-            )
-            self.log(f"Error applying expression `{term}` to column `{col_name}`: {str(e)}")
-            return
+        # Remove the columns from the table display using the column names as keys
+        for ck in col_keys_to_remove:
+            self.remove_column(ck)
 
-        # Recreate table for display
-        self._setup_table()
+        # Move cursor left if we deleted the last column(s)
+        last_col_idx = len(self.columns) - 1
+        if col_idx > last_col_idx:
+            self.move_cursor(column=last_col_idx)
 
-        # self.notify(f"Column [$accent]{col_name}[/] updated with [$success]{expr}[/]", title="Edit")
+        # Remove from sorted columns if present
+        for col_name in col_names_to_remove:
+            if col_name in self.sorted_columns:
+                del self.sorted_columns[col_name]
 
-    def _rename_column(self) -> None:
-        """Open modal to rename the selected column."""
+        # Remove from matches
+        col_indices_to_remove = set(self.df.columns.index(name) for name in col_names_to_remove)
+        for row_idx in list(self.matches.keys()):
+            self.matches[row_idx].difference_update(col_indices_to_remove)
+            # Remove empty entries
+            if not self.matches[row_idx]:
+                del self.matches[row_idx]
+
+        # Remove from dataframe
+        self.df = self.df.drop(col_names_to_remove)
+
+        self.notify(message, title="Delete")
+
+    def do_duplicate_column(self) -> None:
+        """Duplicate the currently selected column, inserting it right after the current column."""
+        cidx = self.cursor_col_idx
         col_name = self.cursor_col_name
+
         col_idx = self.cursor_column
+        new_col_name = f"{col_name}_copy"
 
-        # Push the rename column modal screen
-        self.app.push_screen(
-            RenameColumnScreen(col_idx, col_name, self.df.columns),
-            callback=self._do_rename_column,
+        # Add to history
+        self.add_history(f"Duplicated column [$success]{col_name}[/]", dirty=True)
+
+        # Create new column and reorder columns to insert after current column
+        cols_before = self.df.columns[: cidx + 1]
+        cols_after = self.df.columns[cidx + 1 :]
+
+        # Add the new column and reorder columns for insertion after current column
+        self.df = self.df.with_columns(pl.col(col_name).alias(new_col_name)).select(
+            list(cols_before) + [new_col_name] + list(cols_after)
         )
 
-    def _do_rename_column(self, result) -> None:
-        """Handle result from RenameColumnScreen."""
-        if result is None:
-            return
+        # Update matches to account for new column
+        new_matches = defaultdict(set)
+        for row_idx, cols in self.matches.items():
+            new_cols = set()
+            for col_idx_in_set in cols:
+                if col_idx_in_set <= cidx:
+                    new_cols.add(col_idx_in_set)
+                else:
+                    new_cols.add(col_idx_in_set + 1)
+            new_matches[row_idx] = new_cols
+        self.matches = new_matches
 
-        col_idx, col_name, new_name = result
-        if new_name is None:
-            self.app.push_screen(
-                RenameColumnScreen(col_idx, col_name, self.df.columns),
-                callback=self._do_rename_column,
-            )
-            return
+        # Recreate table for display
+        self.setup_table()
 
-        # Add to history
-        self._add_history(f"Renamed column [$accent]{col_name}[/] to [$success]{new_name}[/]")
+        # Move cursor to the new duplicated column
+        self.move_cursor(column=col_idx + 1)
 
-        # Rename the column in the dataframe
-        self.df = self.df.rename({col_name: new_name})
+        # self.notify(f"Duplicated column [$accent]{col_name}[/] as [$success]{new_col_name}[/]", title="Duplicate")
 
-        # Update sorted_columns if this column was sorted
-        if col_name in self.sorted_columns:
-            self.sorted_columns[new_name] = self.sorted_columns.pop(col_name)
+    def do_delete_row(self, more: str = None) -> None:
+        """Delete rows from the table and dataframe.
 
-        # Update hidden_columns if this column was hidden
-        if col_name in self.hidden_columns:
-            self.hidden_columns.remove(col_name)
-            self.hidden_columns.add(new_name)
+        Supports deleting multiple selected rows. If no rows are selected, deletes the row at the cursor.
+        """
+        old_count = len(self.df)
+        predicates = [True] * len(self.df)
 
-        # Recreate table for display
-        self._setup_table()
+        # Delete all selected rows
+        if selected_count := self.selected_rows.count(True):
+            history_desc = f"Deleted {selected_count} selected row(s)"
 
-        # Move cursor to the renamed column
-        self.move_cursor(column=col_idx)
+            for ridx, selected in enumerate(self.selected_rows):
+                if selected:
+                    predicates[ridx] = False
 
-        # self.notify(f"Renamed column [$success]{col_name}[/] to [$success]{new_name}[/]", title="Column")
+        # Delete current row and those above
+        elif more == "above":
+            ridx = self.cursor_row_idx
+            history_desc = f"Deleted current row [$success]{ridx + 1}[/] and those above"
+            for i in range(ridx + 1):
+                predicates[i] = False
 
-    def _clear_cell(self) -> None:
-        """Clear the current cell by setting its value to None."""
-        row_key, col_key = self.cursor_key
-        ridx = self.cursor_row_idx
-        cidx = self.cursor_col_idx
-        col_name = self.cursor_col_name
+        # Delete current row and those below
+        elif more == "below":
+            ridx = self.cursor_row_idx
+            history_desc = f"Deleted current row [$success]{ridx + 1}[/] and those below"
+            for i in range(ridx, len(self.df)):
+                if self.visible_rows[i]:
+                    predicates[i] = False
+
+        # Delete the row at the cursor
+        else:
+            ridx = self.cursor_row_idx
+            history_desc = f"Deleted row [$success]{ridx + 1}[/]"
+            if self.visible_rows[ridx]:
+                predicates[ridx] = False
 
         # Add to history
-        self._add_history(f"Cleared cell [$success]({ridx + 1}, {col_name})[/]")
+        self.add_history(history_desc, dirty=True)
 
-        # Update the cell to None in the dataframe
+        # Apply the filter to remove rows
         try:
-            self.df = self.df.with_columns(
-                pl.when(pl.arange(0, len(self.df)) == ridx)
-                .then(pl.lit(None))
-                .otherwise(pl.col(col_name))
-                .alias(col_name)
-            )
-
-            # Update the display
-            dtype = self.df.dtypes[cidx]
-            dc = DtypeConfig(dtype)
-            formatted_value = Text(NULL_DISPLAY, style=dc.style, justify=dc.justify)
+            df = self.df.with_row_index(RIDX).filter(predicates)
+        except Exception as e:
+            self.notify(f"Error deleting row(s): {e}", title="Delete", severity="error")
+            self.histories.pop()  # Remove last history entry
+            return
 
-            self.update_cell(row_key, col_key, formatted_value)
+        self.df = df.drop(RIDX)
 
-            # self.notify(f"Cell cleared to [$success]{NULL_DISPLAY}[/]", title="Clear")
-        except Exception as e:
-            self.notify("Error clearing cell", title="Clear", severity="error")
-            self.log(f"Error clearing cell: {str(e)}")
-            raise e
+        # Update selected and visible rows tracking
+        old_row_indices = set(df[RIDX].to_list())
+        self.selected_rows = [selected for i, selected in enumerate(self.selected_rows) if i in old_row_indices]
+        self.visible_rows = [visible for i, visible in enumerate(self.visible_rows) if i in old_row_indices]
 
-    def _add_column(self, col_name: str = None, col_value: pl.Expr = None) -> None:
-        """Add acolumn after the current column."""
-        cidx = self.cursor_col_idx
+        # Clear all matches since row indices have changed
+        self.matches = defaultdict(set)
 
-        if not col_name:
-            # Generate a unique column name
-            base_name = "new_col"
-            new_name = base_name
-            counter = 1
-            while new_name in self.df.columns:
-                new_name = f"{base_name}_{counter}"
-                counter += 1
-        else:
-            new_name = col_name
+        # Recreate table for display
+        self.setup_table()
 
-        # Add to history
-        self._add_history(f"Added column [$success]{new_name}[/] after column {cidx + 1}")
+        deleted_count = old_count - len(self.df)
+        if deleted_count > 0:
+            self.notify(f"Deleted [$accent]{deleted_count}[/] row(s)", title="Delete")
 
-        try:
-            # Create an empty column (all None values)
-            if isinstance(col_value, pl.Expr):
-                new_col = col_value.alias(new_name)
-            else:
-                new_col = pl.lit(col_value).alias(new_name)
+    def do_duplicate_row(self) -> None:
+        """Duplicate the currently selected row, inserting it right after the current row."""
+        ridx = self.cursor_row_idx
 
-            # Get columns up to current, the new column, then remaining columns
-            cols = self.df.columns
-            cols_before = cols[: cidx + 1]
-            cols_after = cols[cidx + 1 :]
+        # Get the row to duplicate
+        row_to_duplicate = self.df.slice(ridx, 1)
 
-            # Build the new dataframe with columns reordered
-            select_cols = cols_before + [new_name] + cols_after
-            self.df = self.df.with_columns(new_col).select(select_cols)
+        # Add to history
+        self.add_history(f"Duplicated row [$success]{ridx + 1}[/]", dirty=True)
 
-            # Recreate table for display
-            self._setup_table()
+        # Concatenate: rows before + duplicated row + rows after
+        df_before = self.df.slice(0, ridx + 1)
+        df_after = self.df.slice(ridx + 1)
 
-            # Move cursor to the new column
-            self.move_cursor(column=cidx + 1)
+        # Combine the parts
+        self.df = pl.concat([df_before, row_to_duplicate, df_after])
 
-            # self.notify(f"Added column [$success]{new_name}[/]", title="Add Column")
-        except Exception as e:
-            self.notify("Error adding column", title="Add Column", severity="error")
-            self.log(f"Error adding column: {str(e)}")
-            raise e
+        # Update selected and visible rows tracking to account for new row
+        new_selected_rows = self.selected_rows[: ridx + 1] + [self.selected_rows[ridx]] + self.selected_rows[ridx + 1 :]
+        new_visible_rows = self.visible_rows[: ridx + 1] + [self.visible_rows[ridx]] + self.visible_rows[ridx + 1 :]
+        self.selected_rows = new_selected_rows
+        self.visible_rows = new_visible_rows
 
-    def _add_column_expr(self) -> None:
-        """Open screen to add a new column with optional expression."""
-        cidx = self.cursor_col_idx
-        self.app.push_screen(
-            AddColumnScreen(cidx, self.df),
-            self._do_add_column_expr,
-        )
+        # Update matches to account for new row
+        new_matches = defaultdict(set)
+        for row_idx, cols in self.matches.items():
+            if row_idx <= ridx:
+                new_matches[row_idx] = cols
+            else:
+                new_matches[row_idx + 1] = cols
+        self.matches = new_matches
 
-    def _do_add_column_expr(self, result: tuple[int, str, str, pl.Expr] | None) -> None:
-        """Add a new column with an expression."""
-        if result is None:
-            return
+        # Recreate table for display
+        self.setup_table()
 
-        cidx, new_col_name, expr = result
+        # Move cursor to the new duplicated row
+        self.move_cursor(row=ridx + 1)
 
-        # Add to history
-        self._add_history(f"Added column [$success]{new_col_name}[/] with expression {expr}.")
+        # self.notify(f"Duplicated row [$success]{ridx + 1}[/]", title="Row")
 
-        try:
-            # Create the column
-            new_col = expr.alias(new_col_name)
+    def do_move_column(self, direction: str) -> None:
+        """Move the current column left or right.
 
-            # Get columns up to current, the new column, then remaining columns
-            cols = self.df.columns
-            cols_before = cols[: cidx + 1]
-            cols_after = cols[cidx + 1 :]
+        Args:
+            direction: "left" to move left, "right" to move right.
+        """
+        row_idx, col_idx = self.cursor_coordinate
+        col_key = self.cursor_col_key
+        col_name = col_key.value
+        cidx = self.cursor_col_idx
 
-            # Build the new dataframe with columns reordered
-            select_cols = cols_before + [new_col_name] + cols_after
-            self.df = self.df.with_row_index(RIDX).with_columns(new_col).select(select_cols)
+        # Validate move is possible
+        if direction == "left":
+            if col_idx <= 0:
+                self.notify("Cannot move column left", title="Move", severity="warning")
+                return
+            swap_idx = col_idx - 1
+        elif direction == "right":
+            if col_idx >= len(self.columns) - 1:
+                self.notify("Cannot move column right", title="Move", severity="warning")
+                return
+            swap_idx = col_idx + 1
 
-            # Recreate table for display
-            self._setup_table()
+        # Get column to swap
+        _, swap_key = self.coordinate_to_cell_key(Coordinate(row_idx, swap_idx))
+        swap_name = swap_key.value
+        swap_cidx = self.df.columns.index(swap_name)
 
-            # Move cursor to the new column
-            self.move_cursor(column=cidx + 1)
+        # Add to history
+        self.add_history(
+            f"Moved column [$success]{col_name}[/] {direction} (swapped with [$success]{swap_name}[/])", dirty=True
+        )
 
-            # self.notify(f"Added column [$success]{col_name}[/]", title="Add Column")
-        except Exception as e:
-            self.notify("Error adding column", title="Add Column", severity="error")
-            self.log(f"Error adding column `{new_col_name}`: {str(e)}")
+        # Swap columns in the table's internal column locations
+        self.check_idle()
 
-    def _add_link_column(self) -> None:
-        self.app.push_screen(
-            AddLinkScreen(self.cursor_col_idx, self.df),
-            callback=self._do_add_link_column,
+        (
+            self._column_locations[col_key],
+            self._column_locations[swap_key],
+        ) = (
+            self._column_locations.get(swap_key),
+            self._column_locations.get(col_key),
         )
 
-    def _do_add_link_column(self, result: tuple[str, str] | None) -> None:
-        """Handle result from AddLinkScreen.
+        self._update_count += 1
+        self.refresh()
 
-        Creates a new link column in the dataframe with clickable links based on a
-        user-provided template. Supports multiple placeholder types:
-        - `$_` - Current column (based on cursor position)
-        - `$1`, `$2`, etc. - Column by 1-based position index
-        - `$name` - Column by name (e.g., `$id`, `$product_name`)
+        # Restore cursor position on the moved column
+        self.move_cursor(row=row_idx, column=swap_idx)
 
-        The template is evaluated for each row using Polars expressions with vectorized
-        string concatenation. The new column is inserted after the current column.
+        # Update the dataframe column order
+        cols = list(self.df.columns)
+        cols[cidx], cols[swap_cidx] = cols[swap_cidx], cols[cidx]
+        self.df = self.df.select(cols)
 
-        Args:
-            result: Tuple of (cidx, new_col_name, link_template) or None if cancelled.
+        # self.notify(f"Moved column [$success]{col_name}[/] {direction}", title="Move")
 
-        Returns:
-            None
-        """
-        if result is None:
-            return
-        cidx, new_col_name, link_template = result
+    def do_move_row(self, direction: str) -> None:
+        """Move the current row up or down.
 
-        self._add_history(f"Added link column [$success]{new_col_name}[/] with template {link_template}.")
+        Args:
+            direction: "up" to move up, "down" to move down.
+        """
+        row_idx, col_idx = self.cursor_coordinate
 
-        try:
-            # Hack to support PubChem link
-            link_template = link_template.replace("PC", "https://pubchem.ncbi.nlm.nih.gov")
+        # Validate move is possible
+        if direction == "up":
+            if row_idx <= 0:
+                self.notify("Cannot move row up", title="Move", severity="warning")
+                return
+            swap_idx = row_idx - 1
+        elif direction == "down":
+            if row_idx >= len(self.rows) - 1:
+                self.notify("Cannot move row down", title="Move", severity="warning")
+                return
+            swap_idx = row_idx + 1
+        else:
+            # Invalid direction
+            return
 
-            # Ensure link starts with http:// or https://
-            if not link_template.startswith(("https://", "http://")):
-                link_template = "https://" + link_template
+        row_key = self.coordinate_to_cell_key((row_idx, 0)).row_key
+        swap_key = self.coordinate_to_cell_key((swap_idx, 0)).row_key
 
-            # Parse template placeholders into Polars expressions
-            parts = parse_placeholders(link_template, self.df.columns, cidx)
+        # Add to history
+        self.add_history(
+            f"Moved row [$success]{row_key.value}[/] {direction} (swapped with row [$success]{swap_key.value}[/])",
+            dirty=True,
+        )
 
-            # Build the concatenation expression
-            exprs = [part if isinstance(part, pl.Expr) else pl.lit(part) for part in parts]
-            new_col = pl.concat_str(exprs).alias(new_col_name)
+        # Swap rows in the table's internal row locations
+        self.check_idle()
 
-            # Get columns up to current, the new column, then remaining columns
-            cols = self.df.columns
-            cols_before = cols[: cidx + 1]
-            cols_after = cols[cidx + 1 :]
+        (
+            self._row_locations[row_key],
+            self._row_locations[swap_key],
+        ) = (
+            self._row_locations.get(swap_key),
+            self._row_locations.get(row_key),
+        )
 
-            # Build the new dataframe with columns reordered
-            select_cols = cols_before + [new_col_name] + cols_after
-            self.df = self.df.with_columns(new_col).select(select_cols)
+        self._update_count += 1
+        self.refresh()
 
-            # Recreate table for display
-            self._setup_table()
+        # Restore cursor position on the moved row
+        self.move_cursor(row=swap_idx, column=col_idx)
 
-            # Move cursor to the new column
-            self.move_cursor(column=cidx + 1)
+        # Swap rows in the dataframe
+        ridx = int(row_key.value)  # 0-based
+        swap_ridx = int(swap_key.value)  # 0-based
+        first, second = sorted([ridx, swap_ridx])
 
-            self.notify(f"Added link column [$success]{new_col_name}[/]. Use Ctrl/Cmd click to open.", title="Add Link")
+        self.df = pl.concat(
+            [
+                self.df.slice(0, first),
+                self.df.slice(second, 1),
+                self.df.slice(first + 1, second - first - 1),
+                self.df.slice(first, 1),
+                self.df.slice(second + 1),
+            ]
+        )
 
-        except Exception as e:
-            self.notify(f"Error adding link column: {str(e)}", title="Add Link", severity="error")
-            self.log(f"Error adding link column: {str(e)}")  # Type Casting
+        # self.notify(f"Moved row [$success]{row_key.value}[/] {direction}", title="Move")
 
-    def _cast_column_dtype(self, dtype: str) -> None:
+    # Type casting
+    def do_cast_column_dtype(self, dtype: str) -> None:
         """Cast the current column to a different data type.
 
         Args:
@@ -2215,8 +2266,9 @@ class DataFrameTable(DataTable):
             return  # No change needed
 
         # Add to history
-        self._add_history(
-            f"Cast column [$accent]{col_name}[/] from [$success]{current_dtype}[/] to [$success]{target_dtype}[/]"
+        self.add_history(
+            f"Cast column [$accent]{col_name}[/] from [$success]{current_dtype}[/] to [$success]{target_dtype}[/]",
+            dirty=True,
         )
 
         try:
@@ -2224,7 +2276,7 @@ class DataFrameTable(DataTable):
             self.df = self.df.with_columns(pl.col(col_name).cast(target_dtype))
 
             # Recreate table for display
-            self._setup_table()
+            self.setup_table()
 
             self.notify(f"Cast column [$accent]{col_name}[/] to [$success]{target_dtype}[/]", title="Cast")
         except Exception as e:
@@ -2236,16 +2288,16 @@ class DataFrameTable(DataTable):
             self.log(f"Error casting column `{col_name}`: {str(e)}")
 
     # Search
-    def _search_cursor_value(self) -> None:
+    def do_search_cursor_value(self) -> None:
         """Search with cursor value in current column."""
         cidx = self.cursor_col_idx
 
         # Get the value of the currently selected cell
         term = NULL if self.cursor_value is None else str(self.cursor_value)
 
-        self._do_search((term, cidx, False, True))
+        self.search((term, cidx, False, True))
 
-    def _search_expr(self) -> None:
+    def do_search_expr(self) -> None:
         """Search by expression."""
         cidx = self.cursor_col_idx
 
@@ -2255,10 +2307,10 @@ class DataFrameTable(DataTable):
         # Push the search modal screen
         self.app.push_screen(
             SearchScreen("Search", term, self.df, cidx),
-            callback=self._do_search,
+            callback=self.search,
         )
 
-    def _do_search(self, result) -> None:
+    def search(self, result) -> None:
         """Search for a term."""
         if result is None:
             return
@@ -2326,7 +2378,7 @@ class DataFrameTable(DataTable):
             return
 
         # Add to history
-        self._add_history(f"Searched [$accent]{term}[/] in column [$success]{col_name}[/]")
+        self.add_history(f"Searched [$accent]{term}[/] in column [$success]{col_name}[/]")
 
         # Update selected rows to include new matches
         for m in matches:
@@ -2336,10 +2388,10 @@ class DataFrameTable(DataTable):
         self.notify(f"Found [$accent]{match_count}[/] matches for [$success]{term}[/]", title="Search")
 
         # Recreate table for display
-        self._setup_table()
+        self.setup_table()
 
     # Find
-    def _find_matches(
+    def find_matches(
         self, term: str, cidx: int | None = None, match_nocase: bool = False, match_whole: bool = False
     ) -> dict[int, set[int]]:
         """Find matches for a term in the dataframe.
@@ -2401,7 +2453,7 @@ class DataFrameTable(DataTable):
 
         return matches
 
-    def _find_cursor_value(self, scope="column") -> None:
+    def do_find_cursor_value(self, scope="column") -> None:
         """Find by cursor value.
 
         Args:
@@ -2412,11 +2464,11 @@ class DataFrameTable(DataTable):
 
         if scope == "column":
             cidx = self.cursor_col_idx
-            self._do_find((term, cidx, False, True))
+            self.find((term, cidx, False, True))
         else:
-            self._do_find_global((term, None, False, True))
+            self.find_global((term, None, False, True))
 
-    def _find_expr(self, scope="column") -> None:
+    def do_find_expr(self, scope="column") -> None:
         """Open screen to find by expression.
 
         Args:
@@ -2429,10 +2481,10 @@ class DataFrameTable(DataTable):
         # Push the search modal screen
         self.app.push_screen(
             SearchScreen("Find", term, self.df, cidx),
-            callback=self._do_find if scope == "column" else self._do_find_global,
+            callback=self.find if scope == "column" else self.find_global,
         )
 
-    def _do_find(self, result) -> None:
+    def find(self, result) -> None:
         """Find a term in current column."""
         if result is None:
             return
@@ -2441,7 +2493,7 @@ class DataFrameTable(DataTable):
         col_name = self.df.columns[cidx]
 
         try:
-            matches = self._find_matches(term, cidx, match_nocase, match_whole)
+            matches = self.find_matches(term, cidx, match_nocase, match_whole)
         except Exception as e:
             self.notify(f"Error finding matches for [$error]{term}[/]", title="Find", severity="error")
             self.log(f"Error finding matches for `{term}`: {str(e)}")
@@ -2456,7 +2508,7 @@ class DataFrameTable(DataTable):
             return
 
         # Add to history
-        self._add_history(f"Found [$accent]{term}[/] in column [$success]{col_name}[/]")
+        self.add_history(f"Found [$accent]{term}[/] in column [$success]{col_name}[/]")
 
         # Add to matches and count total
         match_count = sum(len(col_idxs) for col_idxs in matches.values())
@@ -2466,16 +2518,16 @@ class DataFrameTable(DataTable):
         self.notify(f"Found [$accent]{match_count}[/] matches for [$success]{term}[/]", title="Find")
 
         # Recreate table for display
-        self._setup_table()
+        self.setup_table()
 
-    def _do_find_global(self, result) -> None:
+    def find_global(self, result) -> None:
         """Global find a term across all columns."""
         if result is None:
             return
         term, cidx, match_nocase, match_whole = result
 
         try:
-            matches = self._find_matches(term, cidx=None, match_nocase=match_nocase, match_whole=match_whole)
+            matches = self.find_matches(term, cidx=None, match_nocase=match_nocase, match_whole=match_whole)
         except Exception as e:
             self.notify(f"Error finding matches for [$error]{term}[/]", title="Find", severity="error")
             self.log(f"Error finding matches for `{term}`: {str(e)}")
@@ -2490,7 +2542,7 @@ class DataFrameTable(DataTable):
             return
 
         # Add to history
-        self._add_history(f"Found [$success]{term}[/] across all columns")
+        self.add_history(f"Found [$success]{term}[/] across all columns")
 
         # Add to matches and count total
         match_count = sum(len(col_idxs) for col_idxs in matches.values())
@@ -2502,9 +2554,9 @@ class DataFrameTable(DataTable):
         )
 
         # Recreate table for display
-        self._setup_table()
+        self.setup_table()
 
-    def _next_match(self) -> None:
+    def do_next_match(self) -> None:
         """Move cursor to the next match."""
         if not self.matches:
             self.notify("No matches to navigate", title="Next Match", severity="warning")
@@ -2526,7 +2578,7 @@ class DataFrameTable(DataTable):
         first_ridx, first_cidx = ordered_matches[0]
         self.move_cursor_to(first_ridx, first_cidx)
 
-    def _previous_match(self) -> None:
+    def do_previous_match(self) -> None:
         """Move cursor to the previous match."""
         if not self.matches:
             self.notify("No matches to navigate", title="Previous Match", severity="warning")
@@ -2554,7 +2606,7 @@ class DataFrameTable(DataTable):
         row_idx, col_idx = self.get_cell_coordinate(row_key, col_key)
         self.move_cursor(row=row_idx, column=col_idx)
 
-    def _next_selected_row(self) -> None:
+    def do_next_selected_row(self) -> None:
         """Move cursor to the next selected row."""
         if not any(self.selected_rows):
             self.notify("No selected rows to navigate", title="Next Selected Row", severity="warning")
@@ -2576,7 +2628,7 @@ class DataFrameTable(DataTable):
         first_ridx = selected_row_indices[0]
         self.move_cursor_to(first_ridx, self.cursor_col_idx)
 
-    def _previous_selected_row(self) -> None:
+    def do_previous_selected_row(self) -> None:
         """Move cursor to the previous selected row."""
         if not any(self.selected_rows):
             self.notify("No selected rows to navigate", title="Previous Selected Row", severity="warning")
@@ -2599,31 +2651,31 @@ class DataFrameTable(DataTable):
         self.move_cursor_to(last_ridx, self.cursor_col_idx)
 
     # Replace
-    def _replace(self) -> None:
+    def do_replace(self) -> None:
         """Open replace screen for current column."""
         # Push the replace modal screen
         self.app.push_screen(
             FindReplaceScreen(self, title="Find and Replace in Current Column"),
-            callback=self._do_replace,
+            callback=self.replace,
         )
 
-    def _do_replace(self, result) -> None:
+    def replace(self, result) -> None:
         """Handle replace in current column."""
-        self._handle_replace(result, self.cursor_col_idx)
+        self.handle_replace(result, self.cursor_col_idx)
 
-    def _replace_global(self) -> None:
+    def do_replace_global(self) -> None:
         """Open replace screen for all columns."""
         # Push the replace modal screen
         self.app.push_screen(
             FindReplaceScreen(self, title="Global Find and Replace"),
-            callback=self._do_replace_global,
+            callback=self.replace_global,
         )
 
-    def _do_replace_global(self, result) -> None:
+    def replace_global(self, result) -> None:
         """Handle replace across all columns."""
-        self._handle_replace(result, None)
+        self.handle_replace(result, None)
 
-    def _handle_replace(self, result, cidx) -> None:
+    def handle_replace(self, result, cidx) -> None:
         """Handle replace result from ReplaceScreen.
 
         Args:
@@ -2640,14 +2692,14 @@ class DataFrameTable(DataTable):
             col_name = self.df.columns[cidx]
 
         # Find all matches
-        matches = self._find_matches(term_find, cidx, match_nocase, match_whole)
+        matches = self.find_matches(term_find, cidx, match_nocase, match_whole)
 
         if not matches:
             self.notify(f"No matches found for [$warning]{term_find}[/]", title="Replace", severity="warning")
             return
 
         # Add to history
-        self._add_history(
+        self.add_history(
             f"Replaced [$accent]{term_find}[/] with [$success]{term_replace}[/] in column [$accent]{col_name}[/]"
         )
 
@@ -2655,11 +2707,11 @@ class DataFrameTable(DataTable):
         self.matches = {ridx: col_idxs.copy() for ridx, col_idxs in matches.items()}
 
         # Recreate table for display
-        self._setup_table()
+        self.setup_table()
 
         # Store state for interactive replacement using dataclass
         sorted_rows = sorted(self.matches.keys())
-        self._replace_state = ReplaceState(
+        self.replace_state = ReplaceState(
             term_find=term_find,
             term_replace=term_replace,
             match_nocase=match_nocase,
@@ -2679,10 +2731,10 @@ class DataFrameTable(DataTable):
         try:
             if replace_all:
                 # Replace all occurrences
-                self._do_replace_all(term_find, term_replace)
+                self.replace_all(term_find, term_replace)
             else:
                 # Replace with confirmation for each occurrence
-                self._do_replace_interactive(term_find, term_replace)
+                self.replace_interactive(term_find, term_replace)
 
         except Exception as e:
             self.notify(
@@ -2692,23 +2744,23 @@ class DataFrameTable(DataTable):
             )
             self.log(f"Error replacing `{term_find}` with `{term_replace}`: {str(e)}")
 
-    def _do_replace_all(self, term_find: str, term_replace: str) -> None:
+    def replace_all(self, term_find: str, term_replace: str) -> None:
         """Replace all occurrences."""
-        state = self._replace_state
+        state = self.replace_state
         self.app.push_screen(
             ConfirmScreen(
                 "Replace All",
                 label=f"Replace [$success]{term_find}[/] with [$success]{term_replace or repr('')}[/] for all [$accent]{state.total_occurrence}[/] occurrences?",
             ),
-            callback=self._handle_replace_all_confirmation,
+            callback=self.handle_replace_all_confirmation,
         )
 
-    def _handle_replace_all_confirmation(self, result) -> None:
+    def handle_replace_all_confirmation(self, result) -> None:
         """Handle user's confirmation for replace all."""
         if result is None:
             return
 
-        state = self._replace_state
+        state = self.replace_state
         rows = state.rows
         cols_per_row = state.cols_per_row
 
@@ -2756,7 +2808,11 @@ class DataFrameTable(DataTable):
             state.replaced_occurrence += len(ridxs)
 
         # Recreate table for display
-        self._setup_table()
+        self.setup_table()
+
+        # Mark as dirty if any replacements were made
+        if state.replaced_occurrence > 0:
+            self.dirty = True
 
         col_name = "all columns" if state.cidx is None else self.df.columns[state.cidx]
         self.notify(
@@ -2764,11 +2820,11 @@ class DataFrameTable(DataTable):
             title="Replace",
         )
 
-    def _do_replace_interactive(self, term_find: str, term_replace: str) -> None:
+    def replace_interactive(self, term_find: str, term_replace: str) -> None:
         """Replace with user confirmation for each occurrence."""
         try:
             # Start with first match
-            self._show_next_replace_confirmation()
+            self.show_next_replace_confirmation()
         except Exception as e:
             self.notify(
                 f"Error replacing [$accent]{term_find}[/] with [$error]{term_replace}[/]",
@@ -2777,9 +2833,9 @@ class DataFrameTable(DataTable):
             )
             self.log(f"Error in interactive replace: {str(e)}")
 
-    def _show_next_replace_confirmation(self) -> None:
+    def show_next_replace_confirmation(self) -> None:
         """Show confirmation for next replacement."""
-        state = self._replace_state
+        state = self.replace_state
         if state.done:
             # All done - show final notification
             col_name = "all columns" if state.cidx is None else self.df.columns[state.cidx]
@@ -2787,6 +2843,10 @@ class DataFrameTable(DataTable):
             if state.skipped_occurrence > 0:
                 msg += f", [$warning]{state.skipped_occurrence}[/] skipped"
             self.notify(msg, title="Replace")
+
+            if state.replaced_occurrence > 0:
+                self.dirty = True
+
             return
 
         # Move cursor to next match
@@ -2801,12 +2861,12 @@ class DataFrameTable(DataTable):
 
         self.app.push_screen(
             ConfirmScreen("Replace", label=label, maybe="Skip"),
-            callback=self._handle_replace_confirmation,
+            callback=self.handle_replace_confirmation,
         )
 
-    def _handle_replace_confirmation(self, result) -> None:
+    def handle_replace_confirmation(self, result) -> None:
         """Handle user's confirmation response."""
-        state = self._replace_state
+        state = self.replace_state
         if state.done:
             return
 
@@ -2849,38 +2909,34 @@ class DataFrameTable(DataTable):
         # Cancel
         else:
             state.done = True
-            self._setup_table()
-            return
-
-        # Move to next
-        if state.current_cpos + 1 < len(state.cols_per_row[state.current_rpos]):
-            state.current_cpos += 1
-        else:
-            state.current_cpos = 0
-            state.current_rpos += 1
 
-        if state.current_rpos >= len(state.rows):
-            state.done = True
+        if not state.done:
+            # Get the new value of the current cell after replacement
+            new_cell_value = self.df.item(ridx, cidx)
+            row_key = str(ridx)
+            col_key = col_name
+            self.update_cell(
+                row_key, col_key, Text(str(new_cell_value), style=HIGHLIGHT_COLOR, justify=DtypeConfig(dtype).justify)
+            )
 
-        # Get the new value of the current cell after replacement
-        new_cell_value = self.df.item(ridx, cidx)
-        row_key = str(ridx)
-        col_key = col_name
-        self.update_cell(
-            row_key, col_key, Text(str(new_cell_value), style=HIGHLIGHT_COLOR, justify=DtypeConfig(dtype).justify)
-        )
+            # Move to next
+            if state.current_cpos + 1 < len(state.cols_per_row[state.current_rpos]):
+                state.current_cpos += 1
+            else:
+                state.current_cpos = 0
+                state.current_rpos += 1
 
-        # # Recreate table for display
-        # self._setup_table()
+            if state.current_rpos >= len(state.rows):
+                state.done = True
 
         # Show next confirmation
-        self._show_next_replace_confirmation()
+        self.show_next_replace_confirmation()
 
     # Selection & Match
-    def _toggle_selections(self) -> None:
+    def do_toggle_selections(self) -> None:
         """Toggle selected rows highlighting on/off."""
         # Add to history
-        self._add_history("Toggled row selection")
+        self.add_history("Toggled row selection")
 
         if False in self.visible_rows:
             # Some rows are hidden - invert only selected visible rows and clear selections for hidden rows
@@ -2898,12 +2954,12 @@ class DataFrameTable(DataTable):
             self.notify(f"Toggled selection for [$accent]{new_selected_count}[/] rows", title="Toggle")
 
         # Recreate table for display
-        self._setup_table()
+        self.setup_table()
 
-    def _toggle_row_selection(self) -> None:
+    def do_toggle_row_selection(self) -> None:
         """Select/deselect current row."""
         # Add to history
-        self._add_history("Toggled row selection")
+        self.add_history("Toggled row selection")
 
         ridx = self.cursor_row_idx
         self.selected_rows[ridx] = not self.selected_rows[ridx]
@@ -2924,7 +2980,7 @@ class DataFrameTable(DataTable):
 
             self.update_cell(row_key, col_key, cell_text)
 
-    def _clear_selections_and_matches(self) -> None:
+    def do_clear_selections_and_matches(self) -> None:
         """Clear all selected rows and matches without removing them from the dataframe."""
         # Check if any selected rows or matches
         if not any(self.selected_rows) and not self.matches:
@@ -2936,19 +2992,19 @@ class DataFrameTable(DataTable):
         )
 
         # Add to history
-        self._add_history("Cleared all selected rows")
+        self.add_history("Cleared all selected rows")
 
         # Clear all selections
         self.selected_rows = [False] * len(self.df)
         self.matches = defaultdict(set)
 
         # Recreate table for display
-        self._setup_table()
+        self.setup_table()
 
         self.notify(f"Cleared selections for [$accent]{row_count}[/] rows", title="Clear")
 
     # Filter & View
-    def _filter_rows(self) -> None:
+    def do_filter_rows(self) -> None:
         """Keep only the rows with selections and matches, and remove others."""
         if not any(self.selected_rows) and not self.matches:
             self.notify("No rows to filter", title="Filter", severity="warning")
@@ -2959,28 +3015,23 @@ class DataFrameTable(DataTable):
         ]
 
         # Add to history
-        self._add_history("Filtered to selections and matches")
+        self.add_history("Filtered to selections and matches", dirty=True)
 
         # Apply filter to dataframe with row indices
         df_filtered = self.df.with_row_index(RIDX).filter(filter_expr)
 
-        # Update selections and matches
-        self.selected_rows = [self.selected_rows[ridx] for ridx in df_filtered[RIDX]]
-        self.matches = {
-            idx: self.matches[ridx].copy() for idx, ridx in enumerate(df_filtered[RIDX]) if ridx in self.matches
-        }
-
         # Update dataframe
-        self.df = df_filtered.drop(RIDX)
+        self.reset_df(df_filtered.drop(RIDX))
 
         # Recreate table for display
-        self._setup_table()
+        self.setup_table()
 
         self.notify(
-            f"Removed rows without selections or matches. Now showing [$accent]{len(self.df)}[/] rows", title="Filter"
+            f"Filtered rows with selections or matches and removed others. Now showing [$accent]{len(self.df)}[/] rows",
+            title="Filter",
         )
 
-    def _view_rows(self) -> None:
+    def do_view_rows(self) -> None:
         """View rows.
 
         If there are selected rows or matches, view those rows.
@@ -2997,22 +3048,24 @@ class DataFrameTable(DataTable):
         # Otherwise, use the current cell value
         else:
             ridx = self.cursor_row_idx
-            term = str(self.df.item(ridx, cidx))
+            value = self.df.item(ridx, cidx)
+            term = NULL if value is None else str(value)
 
-        self._do_view_rows((term, cidx, False, True))
+        self.view_rows((term, cidx, False, True))
 
-    def _view_rows_expr(self) -> None:
+    def do_view_rows_expr(self) -> None:
         """Open the filter screen to enter an expression."""
         ridx = self.cursor_row_idx
         cidx = self.cursor_col_idx
-        cursor_value = str(self.df.item(ridx, cidx))
+        cursor_value = self.df.item(ridx, cidx)
+        term = NULL if cursor_value is None else str(cursor_value)
 
         self.app.push_screen(
-            FilterScreen(self.df, cidx, cursor_value),
-            callback=self._do_view_rows,
+            FilterScreen(self.df, cidx, term),
+            callback=self.view_rows,
         )
 
-    def _do_view_rows(self, result) -> None:
+    def view_rows(self, result) -> None:
         """Show only rows with selections or matches, and do hide others. Do not modify the dataframe."""
         if result is None:
             return
@@ -3062,13 +3115,15 @@ class DataFrameTable(DataTable):
         if False in self.visible_rows:
             lf = lf.filter(self.visible_rows)
 
+        expr_str = "boolean list or series" if isinstance(expr, (list, pl.Series)) else str(expr)
+
         # Apply the filter expression
         try:
             df_filtered = lf.filter(expr).collect()
         except Exception as e:
             self.histories.pop()  # Remove last history entry
-            self.notify(f"Error applying filter [$error]{expr}[/]", title="Filter", severity="error")
-            self.log(f"Error applying filter `{expr}`: {str(e)}")
+            self.notify(f"Error applying filter [$error]{expr_str}[/]", title="Filter", severity="error")
+            self.log(f"Error applying filter `{expr_str}`: {str(e)}")
             return
 
         matched_count = len(df_filtered)
@@ -3077,7 +3132,7 @@ class DataFrameTable(DataTable):
             return
 
         # Add to history
-        self._add_history(f"Filtered by expression [$success]{expr}[/]")
+        self.add_history(f"Filtered by expression [$success]{expr_str}[/]")
 
         # Mark unfiltered rows as invisible
         filtered_row_indices = set(df_filtered[RIDX].to_list())
@@ -3087,12 +3142,12 @@ class DataFrameTable(DataTable):
                     self.visible_rows[ridx] = False
 
         # Recreate table for display
-        self._setup_table()
+        self.setup_table()
 
         self.notify(f"Filtered to [$accent]{matched_count}[/] matching rows", title="Filter")
 
     # Copy & Save
-    def _copy_to_clipboard(self, content: str, message: str) -> None:
+    def do_copy_to_clipboard(self, content: str, message: str) -> None:
         """Copy content to clipboard using pbcopy (macOS) or xclip (Linux).
 
         Args:
@@ -3115,54 +3170,64 @@ class DataFrameTable(DataTable):
         except FileNotFoundError:
             self.notify("Error copying to clipboard", title="Clipboard", severity="error")
 
-    def _save_to_file(self) -> None:
+    def do_save_to_file(
+        self, title: str = "Save to File", all_tabs: bool | None = None, task_after_save: str | None = None
+    ) -> None:
         """Open screen to save file."""
-        self.app.push_screen(SaveFileScreen(self.filename), callback=self._do_save_file)
+        self._task_after_save = task_after_save
+
+        multi_tab = len(self.app.tabs) > 1
+        filename = (
+            "all-tabs.xlsx"
+            if all_tabs or (all_tabs is None and multi_tab)
+            else str(Path(self.filename).with_stem(self.tabname))
+        )
+        self.app.push_screen(
+            SaveFileScreen(filename, title=title, all_tabs=all_tabs, multi_tab=multi_tab),
+            callback=self.save_to_file,
+        )
 
-    def _do_save_file(self, filename: str | None, all_tabs: bool = False) -> None:
+    def save_to_file(self, result) -> None:
         """Handle result from SaveFileScreen."""
-        if filename is None:
+        if result is None:
             return
-        filepath = Path(filename)
-        ext = filepath.suffix.lower()
+        filename, all_tabs = result
 
         # Whether to save all tabs (for Excel files)
         self._all_tabs = all_tabs
 
         # Check if file exists
-        if filepath.exists():
+        if Path(filename).exists():
             self._pending_filename = filename
             self.app.push_screen(
                 ConfirmScreen("File already exists. Overwrite?"),
-                callback=self._on_overwrite_screen,
+                callback=self.confirm_overwrite,
             )
-        elif ext in (".xlsx", ".xls"):
-            self._do_save_excel(filename)
         else:
-            self._do_save(filename)
+            self.save_file(filename)
 
-    def _on_overwrite_screen(self, should_overwrite: bool) -> None:
+    def confirm_overwrite(self, should_overwrite: bool) -> None:
         """Handle result from ConfirmScreen."""
         if should_overwrite:
-            self._do_save(self._pending_filename)
+            self.save_file(self._pending_filename)
         else:
             # Go back to SaveFileScreen to allow user to enter a different name
             self.app.push_screen(
                 SaveFileScreen(self._pending_filename),
-                callback=self._do_save_file,
+                callback=self.save_to_file,
             )
 
-    def _do_save(self, filename: str) -> None:
+    def save_file(self, filename: str) -> None:
         """Actually save the dataframe to a file."""
         filepath = Path(filename)
         ext = filepath.suffix.lower()
 
         # Add to history
-        self._add_history(f"Saved dataframe to [$success]{filename}[/]")
+        self.add_history(f"Saved dataframe to [$success]{filename}[/]")
 
         try:
             if ext in (".xlsx", ".xls"):
-                self._do_save_excel(filename)
+                self.save_excel(filename)
             elif ext in (".tsv", ".tab"):
                 self.df.write_csv(filename, separator="\t")
             elif ext == ".json":
@@ -3174,14 +3239,31 @@ class DataFrameTable(DataTable):
 
             self.dataframe = self.df  # Update original dataframe
             self.filename = filename  # Update current filename
-            if not self._all_tabs:
-                extra = "current tab with " if len(self.app.tabs) > 1 else ""
-                self.notify(f"Saved {extra}[$accent]{len(self.df)}[/] rows to [$success]{filename}[/]", title="Save")
+
+            # Reset dirty flag after save
+            if self._all_tabs:
+                tabs: dict[TabPane, DataFrameTable] = self.app.tabs
+                for table in tabs.values():
+                    table.dirty = False
+            else:
+                self.dirty = False
+
+            if self._task_after_save == "close_tab":
+                self.app.do_close_tab()
+            elif self._task_after_save == "quit_app":
+                self.app.exit()
+
+            # From ConfirmScreen callback, so notify accordingly
+            if self._all_tabs:
+                self.notify(f"Saved all tabs to [$success]{filename}[/]", title="Save to File")
+            else:
+                self.notify(f"Saved current tab to [$success]{filename}[/]", title="Save to File")
+
         except Exception as e:
-            self.notify(f"Error saving [$error]{filename}[/]", title="Save", severity="error")
+            self.notify(f"Error saving [$error]{filename}[/]", title="Save to File", severity="error")
             self.log(f"Error saving file `{filename}`: {str(e)}")
 
-    def _do_save_excel(self, filename: str) -> None:
+    def save_excel(self, filename: str) -> None:
         """Save to an Excel file."""
         import xlsxwriter
 
@@ -3192,75 +3274,97 @@ class DataFrameTable(DataTable):
             # Multiple tabs - use xlsxwriter to create multiple sheets
             with xlsxwriter.Workbook(filename) as wb:
                 tabs: dict[TabPane, DataFrameTable] = self.app.tabs
-                for tab, table in tabs.items():
-                    worksheet = wb.add_worksheet(tab.name)
+                for table in tabs.values():
+                    worksheet = wb.add_worksheet(table.tabname)
                     table.df.write_excel(workbook=wb, worksheet=worksheet)
 
-        # From ConfirmScreen callback, so notify accordingly
-        if self._all_tabs is True:
-            self.notify(f"Saved all tabs to [$success]{filename}[/]", title="Save")
-        else:
-            self.notify(
-                f"Saved current tab with [$accent]{len(self.df)}[/] rows to [$success]{filename}[/]", title="Save"
-            )
-
     # SQL Interface
-    def _simple_sql(self) -> None:
+    def do_simple_sql(self) -> None:
         """Open the SQL interface screen."""
         self.app.push_screen(
             SimpleSqlScreen(self),
-            callback=self._do_simple_sql,
+            callback=self.simple_sql,
         )
 
-    def _do_simple_sql(self, result) -> None:
+    def simple_sql(self, result) -> None:
         """Handle SQL result result from SimpleSqlScreen."""
         if result is None:
             return
-        columns, where = result
+        columns, where, view = result
 
         sql = f"SELECT {columns} FROM self"
         if where:
             sql += f" WHERE {where}"
 
-        self._do_sql(sql)
+        self.run_sql(sql, view)
 
-    def _advanced_sql(self) -> None:
+    def do_advanced_sql(self) -> None:
         """Open the advanced SQL interface screen."""
         self.app.push_screen(
             AdvancedSqlScreen(self),
-            callback=self._do_advanced_sql,
+            callback=self.advanced_sql,
         )
 
-    def _do_advanced_sql(self, result) -> None:
+    def advanced_sql(self, result) -> None:
         """Handle SQL result result from AdvancedSqlScreen."""
         if result is None:
             return
+        sql, view = result
 
-        self._do_sql(result)
+        self.run_sql(sql, view)
 
-    def _do_sql(self, sql: str) -> None:
+    def run_sql(self, sql: str, view: bool = True) -> None:
         """Execute a SQL query directly.
 
         Args:
             sql: The SQL query string to execute.
         """
-        # Add to history
-        self._add_history(f"SQL Query:\n[$accent]{sql}[/]")
+
+        import re
+
+        RE_FROM_SELF = re.compile(r"\bfrom\s+self\b", re.IGNORECASE)
+
+        sql = RE_FROM_SELF.sub(f", `{RIDX}` FROM self", sql)
 
         # Execute the SQL query
         try:
-            self.df = self.df.sql(sql)
+            lf = self.df.lazy().with_row_index(RIDX)
+            if False in self.visible_rows:
+                lf = lf.filter(self.visible_rows)
+
+            df_filtered = lf.sql(sql).collect()
+
+            if not len(df_filtered):
+                self.notify(
+                    f"SQL query returned no results for [$warning]{sql}[/]", title="SQL Query", severity="warning"
+                )
+                return
+
+            # Add to history
+            self.add_history(f"SQL Query:\n[$accent]{sql}[/]", dirty=not view)
+
+            if view:
+                # Just view - do not modify the dataframe
+                filtered_row_indices = set(df_filtered[RIDX].to_list())
+                if filtered_row_indices:
+                    self.visible_rows = [ridx in filtered_row_indices for ridx in range(len(self.visible_rows))]
+
+                filtered_col_names = set(df_filtered.columns)
+                if filtered_col_names:
+                    self.hidden_columns = {
+                        col_name for col_name in self.df.columns if col_name not in filtered_col_names
+                    }
+            else:  # filter - modify the dataframe
+                self.df = df_filtered.drop(RIDX)
+                self.visible_rows = [True] * len(self.df)
+                self.hidden_columns.clear()
         except Exception as e:
-            self.notify(f"Error executing SQL query [$error]{sql}[/]", title="SQL Query", severity="error")
+            self.notify(f"Error executing SQL query [$error]{sql}[/]", title="SQL Query", severity="error", timeout=10)
             self.log(f"Error executing SQL query `{sql}`: {str(e)}")
             return
 
-        if not len(self.df):
-            self.notify(f"SQL query returned no results for [$warning]{sql}[/]", title="SQL Query", severity="warning")
-            return
-
         # Recreate table for display
-        self._setup_table()
+        self.setup_table()
 
         self.notify(
             f"SQL query executed successfully. Now showing [$accent]{len(self.df)}[/] rows and [$accent]{len(self.df.columns)}[/] columns.",