modes needs more progress

client/config.toml

@@ -1,6 +1,18 @@
 # config.toml
 [keybindings]
 
+enter_command_mode = [":", "ctrl+;"]
+
+[keybindings.general]
+move_up = ["k", "Up"]
+move_down = ["j", "Down"]
+next_option = ["l", "Right"]
+previous_option = ["h", "Left"]
+select = ["Enter"]
+toggle_sidebar = ["ctrl+t"]
+next_field = ["Tab"]
+prev_field = ["Shift+Tab"]
+
 [keybindings.common]
 save = ["ctrl+s"]
 quit = ["ctrl+q"]
@@ -33,7 +45,6 @@ move_line_start = ["0"]
 move_line_end = ["$"]
 move_first_line = ["gg"]
 move_last_line = ["x"]
-enter_command_mode = [":", "ctrl+;"]
 
 [keybindings.edit]
 exit_edit_mode = ["esc","ctrl+e"]

client/src/config/binds/config.rs

@@ -1,4 +1,4 @@
-// client/src/config/config.rs
+// src/config/binds/config.rs
 
 use serde::Deserialize;
 use std::collections::HashMap;
@@ -25,6 +25,8 @@ pub struct Config {
 
 #[derive(Debug, Deserialize)]
 pub struct ModeKeybindings {
+    #[serde(default)]
+    pub general: HashMap<String, Vec<String>>,
     #[serde(default)]
     pub read_only: HashMap<String, Vec<String>>,
     #[serde(default)]
@@ -33,7 +35,6 @@ pub struct ModeKeybindings {
     pub command: HashMap<String, Vec<String>>,
     #[serde(default)]
     pub common: HashMap<String, Vec<String>>,
-    // Store top-level keybindings that aren't in a specific mode section
     #[serde(flatten)]
     pub global: HashMap<String, Vec<String>>,
 }
@@ -49,6 +50,17 @@ impl Config {
         Ok(config)
     }
 
+
+    pub fn get_general_action(&self, key: KeyCode, modifiers: KeyModifiers) -> Option<&str> {
+        self.get_action_for_key_in_mode(&self.keybindings.general, key, modifiers)
+            .or_else(|| self.get_action_for_key_in_mode(&self.keybindings.global, key, modifiers))
+    }
+
+    /// Common actions for Edit/Read-only modes
+    pub fn get_common_action(&self, key: KeyCode, modifiers: KeyModifiers) -> Option<&str> {
+        self.get_action_for_key_in_mode(&self.keybindings.common, key, modifiers)
+    }
+
     /// Gets an action for a key in Read-Only mode, also checking common keybindings.
     pub fn get_read_only_action_for_key(&self, key: KeyCode, modifiers: KeyModifiers) -> Option<&str> {
         self.get_action_for_key_in_mode(&self.keybindings.read_only, key, modifiers)
@@ -70,6 +82,25 @@ impl Config {
             .or_else(|| self.get_action_for_key_in_mode(&self.keybindings.global, key, modifiers))
     }
 
+    /// Context-aware keybinding resolution
+    pub fn get_action_for_current_context(
+        &self,
+        is_edit_mode: bool,
+        command_mode: bool,
+        key: KeyCode,
+        modifiers: KeyModifiers
+    ) -> Option<&str> {
+        match (command_mode, is_edit_mode) {
+            (true, _) => self.get_command_action_for_key(key, modifiers),
+            (_, true) => self.get_edit_action_for_key(key, modifiers)
+                .or_else(|| self.get_common_action(key, modifiers)),
+            _ => self.get_read_only_action_for_key(key, modifiers)
+                .or_else(|| self.get_common_action(key, modifiers))
+                // Add global bindings check for read-only mode
+                .or_else(|| self.get_action_for_key_in_mode(&self.keybindings.global, key, modifiers)),
+        }
+    }
+
     /// Helper function to get an action for a key in a specific mode.
     pub fn get_action_for_key_in_mode<'a>(
         &self,

client/src/modes/canvas.rs

@@ -0,0 +1,4 @@
+// src/client/modes/canvas.rs
+pub mod edit;
+pub mod common;
+pub mod read_only;

client/src/modes/canvas/common.rs

@@ -1,4 +1,4 @@
-// src/modes/handlers/common.rs
+// src/modes/canvas/common.rs
 
 use crate::tui::terminal::grpc_client::GrpcClient;
 use crate::ui::handlers::form::FormState;

client/src/modes/canvas/edit.rs

@@ -1,12 +1,13 @@
-// src/modes/handlers/edit.rs
+// src/modes/canvas/edit.rs
 
+// TODO THIS is freaking bloated with functions it never uses REFACTOR 200 LOC can be gone
 use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
 use crate::tui::terminal::{
     grpc_client::GrpcClient,
 };
 use crate::config::binds::config::Config;
 use crate::ui::handlers::form::FormState;
-use super::common;
+use crate::modes::canvas::common;
 
 pub async fn handle_edit_event_internal(
     key: KeyEvent,
@@ -19,6 +20,24 @@ pub async fn handle_edit_event_internal(
     total_count: u64,
     grpc_client: &mut GrpcClient,
 ) -> Result<String, Box<dyn std::error::Error>> {
+    if let Some("enter_command_mode") = config.get_action_for_key_in_mode(&config.keybindings.global, key.code, key.modifiers) {
+        // Ignore in edit mode and process as normal input
+        handle_edit_specific_input(key, form_state, ideal_cursor_column);
+        return Ok(command_message.clone());
+    }
+
+    // Check common actions first
+    if let Some(action) = config.get_action_for_key_in_mode(&config.keybindings.common, key.code, key.modifiers) {
+        return execute_common_action(
+            action,
+            form_state,
+            grpc_client,
+            is_saved,
+            current_position,
+            total_count,
+        ).await;
+    }
+
     if let Some(action) = config.get_edit_action_for_key(key.code, key.modifiers) {
         return execute_edit_action(
             action,
@@ -40,6 +59,48 @@ pub async fn handle_edit_event_internal(
     Ok(command_message.clone())
 }
 
+async fn execute_common_action(
+    action: &str,
+    form_state: &mut FormState,
+    grpc_client: &mut GrpcClient,
+    is_saved: &mut bool,
+    current_position: &mut u64,
+    total_count: u64,
+) -> Result<String, Box<dyn std::error::Error>> {
+    match action {
+        "save" => {
+            common::save(
+                form_state,
+                grpc_client,
+                is_saved,
+                current_position,
+                total_count,
+            ).await
+        },
+        "revert" => {
+            common::revert(
+                form_state,
+                grpc_client,
+                current_position,
+                total_count,
+            ).await
+        },
+        "move_up" | "move_down" => {
+            // Reuse edit mode's existing logic
+            execute_edit_action(
+                action,
+                form_state,
+                &mut 0, // Dummy ideal_cursor_column (not used here)
+                grpc_client,
+                is_saved,
+                current_position,
+                total_count,
+            ).await
+        },
+        _ => Ok(format!("Common action not handled: {}", action)),
+    }
+}
+
 fn handle_edit_specific_input(
     key: KeyEvent,
     form_state: &mut FormState,

client/src/modes/common.rs

@@ -0,0 +1,3 @@
+// src/client/modes/common.rs
+pub mod command_mode;
+pub mod highlight;

client/src/modes/common/command_mode.rs

@@ -4,7 +4,9 @@ use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
 use crate::tui::terminal::grpc_client::GrpcClient;
 use crate::config::binds::config::Config;
 use crate::ui::handlers::form::FormState;
-use super::common;
+use crate::modes::{
+    canvas::{common},
+};
 
 pub async fn handle_command_event(
     key: KeyEvent,

client/src/modes/general.rs

@@ -0,0 +1,2 @@
+// src/client/modes/general.rs
+pub mod navigation;

client/src/modes/general/navigation.rs

@@ -0,0 +1,66 @@
+// src/modes/general/navigation.rs
+use crate::state::state::AppState;
+use crate::ui::handlers::form::FormState;
+
+pub fn move_up(app_state: &mut AppState) {
+    app_state.general.selected_item = app_state.general.selected_item.saturating_sub(1);
+}
+
+pub fn move_down(app_state: &mut AppState, item_count: usize) {
+    app_state.general.selected_item = app_state.general.selected_item.saturating_add(1);
+    if item_count > 0 {
+        app_state.general.selected_item = app_state.general.selected_item.min(item_count - 1);
+    }
+}
+
+pub fn next_option(app_state: &mut AppState, option_count: usize) {
+    app_state.general.current_option = app_state.general.current_option.saturating_add(1);
+    if option_count > 0 {
+        app_state.general.current_option = app_state.general.current_option.min(option_count - 1);
+    }
+}
+
+pub fn previous_option(app_state: &mut AppState) {
+    app_state.general.current_option = app_state.general.current_option.saturating_sub(1);
+}
+
+pub fn select(app_state: &mut AppState) {
+    app_state.ui.show_form = app_state.ui.intro_state.selected_option == 0;
+    app_state.ui.show_admin = app_state.ui.intro_state.selected_option == 1;
+    app_state.ui.show_intro = false;
+}
+
+pub fn toggle_sidebar(app_state: &mut AppState) {
+    app_state.ui.show_sidebar = !app_state.ui.show_sidebar;
+}
+
+pub fn next_field(form_state: &mut FormState) {
+    if !form_state.fields.is_empty() {
+        form_state.current_field = (form_state.current_field + 1) % form_state.fields.len();
+    }
+}
+
+pub fn prev_field(form_state: &mut FormState) {
+    if !form_state.fields.is_empty() {
+        form_state.current_field = if form_state.current_field == 0 {
+            form_state.fields.len() - 1
+        } else {
+            form_state.current_field - 1
+        };
+    }
+}
+
+pub fn handle_enter_command_mode(event_handler: &mut crate::modes::handlers::event::EventHandler) {
+    event_handler.command_mode = true;
+    event_handler.command_input.clear();
+    event_handler.command_message.clear();
+}
+
+// Helper function for bounds checking in lists
+pub fn clamp_index(selected: usize, item_count: usize) -> usize {
+    if item_count == 0 {
+        0
+    } else {
+        selected.min(item_count - 1)
+    }
+}

client/src/modes/handlers.rs

@@ -1,6 +1,3 @@
 // src/client/modes/handlers.rs
 pub mod event;
-pub mod edit;
+pub mod mode_manager;
-pub mod common;
-pub mod command_mode;
-pub mod read_only;

client/src/modes/handlers/event.rs

@@ -1,5 +1,5 @@
 // src/modes/handlers/event.rs
-use crossterm::event::{Event, KeyCode};
+use crossterm::event::{Event, KeyEvent};
 use crossterm::cursor::SetCursorStyle;
 use crate::tui::terminal::{
     core::TerminalCore,
@@ -9,9 +9,13 @@ use crate::tui::terminal::{
 use crate::config::binds::config::Config;
 use crate::ui::handlers::form::FormState;
 use crate::ui::handlers::rat_state::UiStateHandler;
-use crate::modes::handlers::{edit, command_mode, read_only};
+use crate::modes::{
+    common::{command_mode},
+    canvas::{edit, read_only, common},
+};
+use crate::modes::navigation;
 use crate::config::binds::key_sequences::KeySequenceTracker;
-use super::common;
+use crate::modes::handlers::mode_manager::{ModeManager, AppMode};
 
 pub struct EventHandler {
     pub command_mode: bool,
@@ -47,180 +51,296 @@ impl EventHandler {
         app_state: &mut crate::state::state::AppState,
         total_count: u64,
         current_position: &mut u64,
-        intro_state: &mut crate::components::intro::intro::IntroState,
     ) -> Result<(bool, String), Box<dyn std::error::Error>> {
-        if app_state.ui.show_intro {
+        // Determine current mode based on app state and event handler state
-            if let Event::Key(key) = event {
+        let current_mode = ModeManager::derive_mode(app_state, self);
-                match key.code {
+        app_state.update_mode(current_mode);
-                    KeyCode::Left => intro_state.previous_option(),
-                    KeyCode::Right => intro_state.next_option(),
-                    KeyCode::Enter => {
-                        if intro_state.selected_option == 0 {
-                            app_state.ui.show_intro = false;
-                        } else {
-                            app_state.ui.show_intro = false;
-                            app_state.ui.show_admin = true;
-                        }
-                        return Ok((false, String::new()));
-                    }
-                    _ => {}
-                }
-            }
-            return Ok((false, String::new()));
-        }
 
         if let Event::Key(key) = event {
             let key_code = key.code;
             let modifiers = key.modifiers;
 
-            if UiStateHandler::toggle_sidebar(
+            // Handle common actions across all modes
-                &mut app_state.ui,
+            if UiStateHandler::toggle_sidebar(&mut app_state.ui, config, key_code, modifiers) {
-                config,
-                key_code,
-                modifiers,
-            ) {
                 return Ok((false, format!("Sidebar {}",
                     if app_state.ui.show_sidebar { "shown" } else { "hidden" }
                 )));
             }
 
-            if let Some(action) = config.get_action_for_key_in_mode(
+            // Mode-specific handling
-                &config.keybindings.common,
+            match current_mode {
-                key_code,
+                AppMode::General => {
-                modifiers
+                    return self.handle_general_mode(
-            ) {
+                        key,
-                match action {
+                        config,
-                    "save" => {
+                        form_state,
-                        let message = common::save(
+                        app_state,
-                            form_state,
+                    );
-                            grpc_client,
+                },
-                            &mut app_state.ui.is_saved,
-                            current_position,
-                            total_count,
-                        ).await?;
-                        return Ok((false, message));
-                    },
-                    "force_quit" => {
-                        let (should_exit, message) = command_handler.handle_command("force_quit", terminal).await?;
-                        return Ok((should_exit, message));
-                    },
-                    "save_and_quit" => {
-                        let (should_exit, message) = command_handler.handle_command("save_and_quit", terminal).await?;
-                        return Ok((should_exit, message));
-                    },
-                    "revert" => {
-                        let message = common::revert(
-                            form_state,
-                            grpc_client,
-                            current_position,
-                            total_count,
-                        ).await?;
-                        return Ok((false, message));
-                    },
-                    _ => {}
-                }
-            }
 
-            if self.command_mode {
+                AppMode::ReadOnly => {
-                let (should_exit, message, exit_command_mode) = command_mode::handle_command_event(
+                    // Check for mode transitions first
-                    key,
+                    if config.is_enter_edit_mode_before(key_code, modifiers) &&
-                    config,
+                       ModeManager::can_enter_edit_mode(current_mode) {
-                    form_state,
+                        self.is_edit_mode = true;
-                    &mut self.command_input,
+                        self.edit_mode_cooldown = true;
-                    &mut self.command_message,
+                        self.command_message = "Edit mode".to_string();
-                    grpc_client,
+                        terminal.set_cursor_style(SetCursorStyle::BlinkingBar)?;
-                    &mut app_state.ui.is_saved,
-                    current_position,
-                    total_count,
-                ).await?;
-
-                if exit_command_mode {
-                    self.command_mode = false;
-                }
-
-                return Ok((should_exit, message));
-            }
-
-            if self.is_edit_mode {
-                if config.is_exit_edit_mode(key_code, modifiers) {
-                    if form_state.has_unsaved_changes {
-                        self.command_message = "Unsaved changes! Use :w to save or :q! to discard".to_string();
                         return Ok((false, self.command_message.clone()));
                     }
-                    self.is_edit_mode = false;
-                    self.edit_mode_cooldown = true;
-                    self.command_message = "Read-only mode".to_string();
-                    terminal.set_cursor_style(SetCursorStyle::SteadyBlock)?;
 
-                    let current_input = form_state.get_current_input();
+                    if config.is_enter_edit_mode_after(key_code, modifiers) &&
-                    if !current_input.is_empty() && form_state.current_cursor_pos >= current_input.len() {
+                       ModeManager::can_enter_edit_mode(current_mode) {
-                        form_state.current_cursor_pos = current_input.len() - 1;
+                        let current_input = form_state.get_current_input();
-                        self.ideal_cursor_column = form_state.current_cursor_pos;
+                        if !current_input.is_empty() && form_state.current_cursor_pos < current_input.len() {
+                            form_state.current_cursor_pos += 1;
+                            self.ideal_cursor_column = form_state.current_cursor_pos;
+                        }
+                        self.is_edit_mode = true;
+                        self.edit_mode_cooldown = true;
+                        self.command_message = "Edit mode (after cursor)".to_string();
+                        terminal.set_cursor_style(SetCursorStyle::BlinkingBar)?;
+                        return Ok((false, self.command_message.clone()));
                     }
-                    return Ok((false, self.command_message.clone()));
-                }
 
-                let result = edit::handle_edit_event_internal(
+                    // Check for entering command mode
-                    key,
+                    if let Some(action) = config.get_read_only_action_for_key(key_code, modifiers) {
-                    config,
+                        if action == "enter_command_mode" && ModeManager::can_enter_command_mode(current_mode) {
-                    form_state,
+                            self.command_mode = true;
-                    &mut self.ideal_cursor_column,
+                            self.command_input.clear();
-                    &mut self.command_message,
+                            self.command_message.clear();
-                    &mut app_state.ui.is_saved,
+                            return Ok((false, String::new()));
-                    current_position,
+                        }
-                    total_count,
-                    grpc_client,
-                ).await?;
-
-                self.key_sequence_tracker.reset();
-                return Ok((false, result));
-            } else {
-                if let Some(action) = config.get_read_only_action_for_key(key_code, modifiers) {
-                    if action == "enter_command_mode" {
-                        self.command_mode = true;
-                        self.command_input.clear();
-                        self.command_message.clear();
-                        return Ok((false, String::new()));
                     }
-                }
 
-                if config.is_enter_edit_mode_before(key_code, modifiers) {
+                    // Check for core application actions (save, quit, etc.)
-                    self.is_edit_mode = true;
+                    // ONLY handle a limited subset of core actions here
-                    self.edit_mode_cooldown = true;
+                    if let Some(action) = config.get_action_for_key_in_mode(
-                    self.command_message = "Edit mode".to_string();
+                        &config.keybindings.common,
-                    terminal.set_cursor_style(SetCursorStyle::BlinkingBar)?;
+                        key_code,
-                    return Ok((false, self.command_message.clone()));
+                        modifiers
-                }
+                    ) {
-
+                        match action {
-                if config.is_enter_edit_mode_after(key_code, modifiers) {
+                            "save" | "force_quit" | "save_and_quit" | "revert" => {
-                    let current_input = form_state.get_current_input();
+                                return self.handle_core_action(
-                    if !current_input.is_empty() && form_state.current_cursor_pos < current_input.len() {
+                                    action,
-                        form_state.current_cursor_pos += 1;
+                                    form_state,
-                        self.ideal_cursor_column = form_state.current_cursor_pos;
+                                    grpc_client,
+                                    command_handler,
+                                    terminal,
+                                    app_state,
+                                    current_position,
+                                    total_count,
+                                ).await;
+                            },
+                            _ => {} // For other actions, let the mode-specific handler take care of it
+                        }
                     }
-                    self.is_edit_mode = true;
-                    self.edit_mode_cooldown = true;
-                    self.command_message = "Edit mode (after cursor)".to_string();
-                    terminal.set_cursor_style(SetCursorStyle::BlinkingBar)?;
-                    return Ok((false, self.command_message.clone()));
-                }
 
-                return read_only::handle_read_only_event(
+                    // Let read_only mode handle its own actions (including navigation from common bindings)
-                    key,
+                    return read_only::handle_read_only_event(
-                    config,
+                        key,
-                    form_state,
+                        config,
-                    &mut self.key_sequence_tracker,
+                        form_state,
-                    current_position,
+                        &mut self.key_sequence_tracker,
-                    total_count,
+                        current_position,
-                    grpc_client,
+                        total_count,
-                    &mut self.command_message,
+                        grpc_client,
-                    &mut self.edit_mode_cooldown,
+                        &mut self.command_message,
-                    &mut self.ideal_cursor_column,
+                        &mut self.edit_mode_cooldown,
-                ).await;
+                        &mut self.ideal_cursor_column,
+                    ).await;
+                },
+
+                AppMode::Edit => {
+                    // Check for exiting edit mode
+                    if config.is_exit_edit_mode(key_code, modifiers) {
+                        if form_state.has_unsaved_changes {
+                            self.command_message = "Unsaved changes! Use :w to save or :q! to discard".to_string();
+                            return Ok((false, self.command_message.clone()));
+                        }
+                        self.is_edit_mode = false;
+                        self.edit_mode_cooldown = true;
+                        self.command_message = "Read-only mode".to_string();
+                        terminal.set_cursor_style(SetCursorStyle::SteadyBlock)?;
+
+                        let current_input = form_state.get_current_input();
+                        if !current_input.is_empty() && form_state.current_cursor_pos >= current_input.len() {
+                            form_state.current_cursor_pos = current_input.len() - 1;
+                            self.ideal_cursor_column = form_state.current_cursor_pos;
+                        }
+                        return Ok((false, self.command_message.clone()));
+                    }
+
+                    // Check for core application actions (save, quit, etc.)
+                    // ONLY handle a limited subset of core actions here
+                    if let Some(action) = config.get_action_for_key_in_mode(
+                        &config.keybindings.common,
+                        key_code,
+                        modifiers
+                    ) {
+                        match action {
+                            "save" | "force_quit" | "save_and_quit" | "revert" => {
+                                return self.handle_core_action(
+                                    action,
+                                    form_state,
+                                    grpc_client,
+                                    command_handler,
+                                    terminal,
+                                    app_state,
+                                    current_position,
+                                    total_count,
+                                ).await;
+                            },
+                            _ => {} // For other actions, let the mode-specific handler take care of it
+                        }
+                    }
+
+                    // Let edit mode handle its own actions (including navigation from common bindings)
+                    let result = edit::handle_edit_event_internal(
+                        key,
+                        config,
+                        form_state,
+                        &mut self.ideal_cursor_column,
+                        &mut self.command_message,
+                        &mut app_state.ui.is_saved,
+                        current_position,
+                        total_count,
+                        grpc_client,
+                    ).await?;
+
+                    self.key_sequence_tracker.reset();
+                    return Ok((false, result));
+                },
+
+                AppMode::Command => {
+                    let (should_exit, message, exit_command_mode) = command_mode::handle_command_event(
+                        key,
+                        config,
+                        form_state,
+                        &mut self.command_input,
+                        &mut self.command_message,
+                        grpc_client,
+                        &mut app_state.ui.is_saved,
+                        current_position,
+                        total_count,
+                    ).await?;
+
+                    if exit_command_mode {
+                        self.command_mode = false;
+                    }
+
+                    return Ok((should_exit, message));
+                }
             }
         }
 
+        // Non-key events or if no specific handler was matched
         self.edit_mode_cooldown = false;
         Ok((false, self.command_message.clone()))
     }
+
+    // Helper method for handling general mode actions
+    fn handle_general_mode(
+        &mut self,
+        key: KeyEvent,
+        config: &Config,
+        form_state: &mut FormState,
+        app_state: &mut crate::state::state::AppState,
+    ) -> Result<(bool, String), Box<dyn std::error::Error>> {
+        if let Some(action) = config.get_general_action(key.code, key.modifiers) {
+            match action {
+                "move_up" => {
+                    navigation::move_up(app_state);
+                    return Ok((false, String::new()));
+                }
+                "move_down" => {
+                    let item_count = if app_state.ui.show_intro {
+                        2 // Intro options count
+                    } else {
+                        app_state.profile_tree.profiles.len() // Admin panel items
+                    };
+                    navigation::move_down(app_state, item_count);
+                    return Ok((false, String::new()));
+                }
+                "next_option" => {
+                    navigation::next_option(app_state, 2); // Intro has 2 options
+                    return Ok((false, String::new()));
+                }
+                "previous_option" => {
+                    navigation::previous_option(app_state);
+                    return Ok((false, String::new()));
+                }
+                "select" => {
+                    navigation::select(app_state);
+                    return Ok((false, "Selected".to_string()));
+                }
+                "toggle_sidebar" => {
+                    navigation::toggle_sidebar(app_state);
+                    return Ok((false, format!("Sidebar {}",
+                        if app_state.ui.show_sidebar { "shown" } else { "hidden" }
+                    )));
+                }
+                "next_field" => {
+                    navigation::next_field(form_state);
+                    return Ok((false, String::new()));
+                }
+                "prev_field" => {
+                    navigation::prev_field(form_state);
+                    return Ok((false, String::new()));
+                }
+                "enter_command_mode" => {
+                    navigation::handle_enter_command_mode(self);
+                    return Ok((false, String::new()));
+                }
+                _ => {}
+            }
+        }
+        Ok((false, String::new()))
+    }
+
+    // Helper method for handling core application actions (not navigation)
+    async fn handle_core_action(
+        &mut self,
+        action: &str,
+        form_state: &mut FormState,
+        grpc_client: &mut GrpcClient,
+        command_handler: &mut CommandHandler,
+        terminal: &mut TerminalCore,
+        app_state: &mut crate::state::state::AppState,
+        current_position: &mut u64,
+        total_count: u64,
+    ) -> Result<(bool, String), Box<dyn std::error::Error>> {
+        match action {
+            "save" => {
+                let message = common::save(
+                    form_state,
+                    grpc_client,
+                    &mut app_state.ui.is_saved,
+                    current_position,
+                    total_count,
+                ).await?;
+                Ok((false, message))
+            },
+            "force_quit" => {
+                let (should_exit, message) = command_handler.handle_command("force_quit", terminal).await?;
+                Ok((should_exit, message))
+            },
+            "save_and_quit" => {
+                let (should_exit, message) = command_handler.handle_command("save_and_quit", terminal).await?;
+                Ok((should_exit, message))
+            },
+            "revert" => {
+                let message = common::revert(
+                    form_state,
+                    grpc_client,
+                    current_position,
+                    total_count,
+                ).await?;
+                Ok((false, message))
+            },
+            // We should never hit this case given our filtering above
+            _ => Ok((false, format!("Core action not handled: {}", action))),
+        }
+    }
 }

client/src/modes/handlers/mode_manager.rs

@@ -0,0 +1,50 @@
+// src/modes/handlers/mode_manager.rs
+use crate::state::state::AppState;
+use crate::modes::handlers::event::EventHandler;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum AppMode {
+    General,   // For intro and admin screens
+    ReadOnly,  // Canvas read-only mode
+    Edit,      // Canvas edit mode
+    Command,   // Command mode overlay
+}
+
+pub struct ModeManager;
+
+impl ModeManager {
+    // Determine current mode based on app state
+    pub fn derive_mode(app_state: &AppState, event_handler: &EventHandler) -> AppMode {
+        // Command mode takes precedence if active
+        if event_handler.command_mode {
+            return AppMode::Command;
+        }
+
+        // Check UI state flags
+        if app_state.ui.show_intro || app_state.ui.show_admin {
+            AppMode::General
+        } else if app_state.ui.show_form {
+            if event_handler.is_edit_mode {
+                AppMode::Edit
+            } else {
+                AppMode::ReadOnly
+            }
+        } else {
+            // Fallback
+            AppMode::General
+        }
+    }
+    
+    // Mode transition rules
+    pub fn can_enter_command_mode(current_mode: AppMode) -> bool {
+        !matches!(current_mode, AppMode::Edit)  // Can't enter from Edit mode
+    }
+    
+    pub fn can_enter_edit_mode(current_mode: AppMode) -> bool {
+        matches!(current_mode, AppMode::ReadOnly)  // Only from ReadOnly
+    }
+    
+    pub fn can_enter_read_only_mode(current_mode: AppMode) -> bool {
+        matches!(current_mode, AppMode::Edit | AppMode::Command)
+    }
+}

client/src/modes/mod.rs

@@ -1,4 +1,10 @@
 // src/client/modes/mod.rs
 pub mod handlers;
+pub mod canvas;
+pub mod general;
+pub mod common;
 
 pub use handlers::*;
+pub use canvas::*;
+pub use general::*;
+pub use common::*;

client/src/state/state.rs

@@ -2,12 +2,21 @@
 
 use std::env;
 use common::proto::multieko2::table_definition::ProfileTreeResponse;
+use crate::components::IntroState;
+use crate::modes::handlers::mode_manager::AppMode;
 
 pub struct UiState {
     pub show_sidebar: bool,
     pub is_saved: bool,
     pub show_intro: bool,
     pub show_admin: bool,
+    pub show_form: bool,
+    pub intro_state: IntroState,
+}
+
+pub struct GeneralState {
+    pub selected_item: usize,
+    pub current_option: usize,
 }
 
 pub struct AppState {
@@ -17,9 +26,11 @@ pub struct AppState {
     pub current_position: u64,
     pub profile_tree: ProfileTreeResponse,
     pub selected_profile: Option<String>,
+    pub current_mode: AppMode,
 
     // UI preferences
     pub ui: UiState,
+    pub general: GeneralState,
 }
 
 impl AppState {
@@ -33,7 +44,12 @@ impl AppState {
             current_position: 0,
             profile_tree: ProfileTreeResponse::default(),
             selected_profile: None,
+            current_mode: AppMode::General,
             ui: UiState::default(),
+            general: GeneralState {
+                selected_item: 0,
+                current_option: 0,
+            },
         })
     }
 
@@ -45,6 +61,10 @@ impl AppState {
     pub fn update_current_position(&mut self, current_position: u64) {
         self.current_position = current_position;
     }
+
+    pub fn update_mode(&mut self, mode: AppMode) {
+        self.current_mode = mode;
+    }
 }
 
 impl Default for UiState {
@@ -54,6 +74,8 @@ impl Default for UiState {
             is_saved: false,
             show_intro: true,
             show_admin: false,
+            show_form: false,
+            intro_state: IntroState::new(),
         }
     }
 }

client/src/ui/handlers/render.rs

@@ -27,7 +27,6 @@ pub fn render_ui(
     command_message: &str,
     app_state: &AppState,
     intro_state: &intro::IntroState,
-    admin_panel_state: &mut AdminPanelState,
 ) {
     render_background(f, f.area(), theme);
 
@@ -44,14 +43,32 @@ pub fn render_ui(
     if app_state.ui.show_intro {
         intro_state.render(f, main_content_area, theme);
     } else if app_state.ui.show_admin {
-        admin_panel_state.render(
+        // Create temporary AdminPanelState for rendering
+        let mut admin_state = AdminPanelState::new(
+            if app_state.profile_tree.profiles.is_empty() {
+                // Fallback if admin_profiles is empty
+                app_state.profile_tree.profiles
+                    .iter()
+                    .map(|p| p.name.clone())
+                    .collect()
+            } else {
+                app_state.profile_tree.profiles.iter().map(|p| p.name.clone()).collect()
+            }
+        );
+
+        // Set the selected item
+        if !admin_state.profiles.is_empty() {
+            app_state.general.selected_item.min(admin_state.profiles.len().saturating_sub(1));
+        }
+
+        admin_state.render(
             f,
             main_content_area,
             theme,
-            &app_state.profile_tree,
+            &app_state.profile_tree, 
             &app_state.selected_profile,
         );
-    } else {
+    } else if app_state.ui.show_form {
         let (sidebar_area, form_area) = calculate_sidebar_layout(
             app_state.ui.show_sidebar,
             main_content_area
@@ -63,7 +80,7 @@ pub fn render_ui(
                 sidebar_rect, 
                 theme, 
                 &app_state.profile_tree, 
-                &app_state.selected_profile  // Remove trailing comma
+                &app_state.selected_profile
             );
         }
 
@@ -107,6 +124,8 @@ pub fn render_ui(
             total_count,
             current_position,
         );
+    } else{
+
     }
 
     render_status_line(f, root[1], current_dir, theme, is_edit_mode);

client/src/ui/handlers/ui.rs

@@ -28,11 +28,11 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     app_state.profile_tree = profile_tree;
 
     // Now create admin panel with profiles from app_state
-    let profiles = app_state.profile_tree.profiles
+    if intro_state.selected_option == 1 {
-        .iter()
+        app_state.ui.show_admin = true;
-        .map(|p| p.name.clone())
+        app_state.general.selected_item = 0;
-        .collect();
+        app_state.general.current_option = 0;
-    let mut admin_panel_state = AdminPanelState::new(profiles);
+    }
 
     // Fetch table structure at startup (one-time)
     let table_structure = grpc_client.get_table_structure().await?;
@@ -75,7 +75,6 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
                 &event_handler.command_message,
                 &app_state,
                 &intro_state,
-                &mut admin_panel_state,
             );
         })?;
 
@@ -93,7 +92,6 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
             &mut app_state,
             total_count,
             &mut current_position,
-            &mut intro_state,
         ).await?;
 
         app_state.current_position = current_position;