working finally

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/components/admin/admin_panel.rs

@@ -1,21 +1,49 @@
 // src/components/admin/admin_panel.rs
+
 use ratatui::{
-    layout::{Alignment, Constraint, Direction, Layout, Rect},
+    widgets::{Block, BorderType, Borders, List, ListItem, ListState, Paragraph},
     style::Style,
-    text::{Line, Span},
-    widgets::{Block, BorderType, Borders, Paragraph},
+    text::{Line, Span, Text},
+    layout::{Alignment, Constraint, Direction, Layout, Rect},
     Frame,
 };
-use crate::config::colors::Theme;
+use common::proto::multieko2::table_definition::ProfileTreeResponse;
+use crate::config::colors::themes::Theme;
 
-pub struct AdminPanelState;
+pub struct AdminPanelState {
+    pub list_state: ListState,
+    pub profiles: Vec<String>,
+}
 
 impl AdminPanelState {
-    pub fn new() -> Self {
-        Self
+    pub fn new(profiles: Vec<String>) -> Self {
+        let mut list_state = ListState::default();
+        if !profiles.is_empty() {
+            list_state.select(Some(0));
+        }
+        Self { list_state, profiles }
     }
 
-    pub fn render(&self, f: &mut Frame, area: Rect, theme: &Theme) {
+    pub fn next(&mut self) {
+        let i = self.list_state.selected().map_or(0, |i| 
+            if i >= self.profiles.len() - 1 { 0 } else { i + 1 });
+        self.list_state.select(Some(i));
+    }
+
+    pub fn previous(&mut self) {
+        let i = self.list_state.selected().map_or(0, |i| 
+            if i == 0 { self.profiles.len() - 1 } else { i - 1 });
+        self.list_state.select(Some(i));
+    }
+
+    pub fn render(
+        &mut self,
+        f: &mut Frame,
+        area: Rect,
+        theme: &Theme,
+        profile_tree: &ProfileTreeResponse,
+        selected_profile: &Option<String>,
+    ) {
         let block = Block::default()
             .borders(Borders::ALL)
             .border_type(BorderType::Rounded)
@@ -27,18 +55,64 @@ impl AdminPanelState {
 
         let chunks = Layout::default()
             .direction(Direction::Vertical)
-            .constraints([
-                Constraint::Length(3), // Title
-                Constraint::Min(1),   // Content
-            ])
+            .constraints([Constraint::Length(3), Constraint::Min(1)])
             .split(inner_area);
 
+        // Title
         let title = Line::from(Span::styled("Admin Panel", Style::default().fg(theme.highlight)));
-        let title_para = Paragraph::new(title)
-            .alignment(Alignment::Center);
-        f.render_widget(title_para, chunks[0]);
+        let title_widget = Paragraph::new(title).alignment(Alignment::Center);
+        f.render_widget(title_widget, chunks[0]);
 
-        let content = Paragraph::new("Admin panel content goes here");
-        f.render_widget(content, chunks[1]);
+        // Content
+        let content_chunks = Layout::default()
+            .direction(Direction::Horizontal)
+            .constraints([Constraint::Percentage(30), Constraint::Percentage(70)])
+            .split(chunks[1]);
+
+        // Profile list
+        let items: Vec<ListItem> = self.profiles.iter()
+            .map(|p| ListItem::new(Line::from(vec![
+                Span::styled(
+                    if Some(p) == selected_profile.as_ref() { "✓ " } else { "  " },
+                    Style::default().fg(theme.accent)
+                ),
+                Span::styled(p, Style::default().fg(theme.fg)),
+            ])))
+            .collect();
+
+        let list = List::new(items)
+            .block(Block::default().title("Profiles"))
+            .highlight_style(Style::default().bg(theme.highlight).fg(theme.bg));
+        
+        f.render_stateful_widget(list, content_chunks[0], &mut self.list_state);
+
+        // Profile details
+        if let Some(profile) = self.list_state.selected()
+            .and_then(|i| profile_tree.profiles.get(i)) 
+        {
+            let mut text = Text::default();
+            text.lines.push(Line::from(vec![
+                Span::styled("Profile: ", Style::default().fg(theme.accent)),
+                Span::styled(&profile.name, Style::default().fg(theme.highlight)),
+            ]));
+
+            text.lines.push(Line::from(""));
+            text.lines.push(Line::from(Span::styled("Tables:", Style::default().fg(theme.accent))));
+            
+            for table in &profile.tables {
+                let mut line = vec![Span::styled(format!("├─ {}", table.name), theme.fg)];
+                if !table.depends_on.is_empty() {
+                    line.push(Span::styled(
+                        format!(" → {}", table.depends_on.join(", ")),
+                        Style::default().fg(theme.secondary)
+                    ));
+                }
+                text.lines.push(Line::from(line));
+            }
+
+            let details_widget = Paragraph::new(text)
+                .block(Block::default().title("Details"));
+            f.render_widget(details_widget, content_chunks[1]);
+        }
     }
 }

client/src/components/common/background.rs

@@ -5,7 +5,7 @@ use ratatui::{
     style::Style,
     Frame,
 };
-use crate::config::colors::Theme;
+use crate::config::colors::themes::Theme;
 
 pub fn render_background(f: &mut Frame, area: Rect, theme: &Theme) {
     let background = Block::default()

client/src/components/common/command_line.rs

@@ -5,7 +5,7 @@ use ratatui::{
     layout::Rect,
     Frame,
 };
-use crate::config::colors::Theme;
+use crate::config::colors::themes::Theme;
 
 pub fn render_command_line(f: &mut Frame, area: Rect, input: &str, active: bool, theme: &Theme, message: &str) {
     let prompt = if active {

client/src/components/common/status_line.rs

@@ -6,7 +6,7 @@ use ratatui::{
     Frame,
     text::{Line, Span},
 };
-use crate::config::colors::Theme;
+use crate::config::colors::themes::Theme;
 use std::path::Path;
 
 pub fn render_status_line(

client/src/components/form.rs

@@ -0,0 +1,4 @@
+// src/components/form.rs
+pub mod form;
+
+pub use form::*;

client/src/components/form/form.rs

@@ -5,9 +5,9 @@ use ratatui::{
     style::Style,
     Frame,
 };
-use crate::config::colors::Theme;
+use crate::config::colors::themes::Theme;
 use crate::ui::form::FormState;
-use super::canvas::render_canvas;  // Changed to canvas
+use crate::components::handlers::canvas::render_canvas;
 
 pub fn render_form(
     f: &mut Frame,

client/src/components/handlers.rs

@@ -1,8 +1,6 @@
 // src/components/handlers.rs
-pub mod form;
 pub mod canvas;
 pub mod sidebar;
 
-pub use form::*;
 pub use canvas::*;
 pub use sidebar::*;

client/src/components/handlers/canvas.rs

@@ -7,7 +7,7 @@ use ratatui::{
     Frame,
     prelude::Alignment,
 };
-use crate::config::colors::Theme;
+use crate::config::colors::themes::Theme;
 use crate::ui::form::FormState;
 
 pub fn render_canvas(

client/src/components/handlers/sidebar.rs

@@ -5,11 +5,12 @@ use ratatui::{
     style::Style,
     Frame,
 };
-use crate::config::colors::Theme;
+use crate::config::colors::themes::Theme;
 use common::proto::multieko2::table_definition::{ProfileTreeResponse};
 use ratatui::text::{Span, Line};
 
-const SIDEBAR_WIDTH: u16 = 16;
+// Reduced sidebar width
+const SIDEBAR_WIDTH: u16 = 12;
 
 pub fn calculate_sidebar_layout(show_sidebar: bool, main_content_area: Rect) -> (Option<Rect>, Rect) {
     if show_sidebar {
@@ -26,47 +27,83 @@ pub fn calculate_sidebar_layout(show_sidebar: bool, main_content_area: Rect) ->
     }
 }
 
-pub fn render_sidebar(f: &mut Frame, area: Rect, theme: &Theme, profile_tree: &ProfileTreeResponse) {
-    let sidebar_block = Block::default()
-        .style(Style::default().bg(theme.bg));
-
+pub fn render_sidebar(
+    f: &mut Frame,
+    area: Rect,
+    theme: &Theme,
+    profile_tree: &ProfileTreeResponse,
+    selected_profile: &Option<String>,
+) {
+    let sidebar_block = Block::default().style(Style::default().bg(theme.bg));
     let mut items = Vec::new();
 
-    for profile in &profile_tree.profiles {
-        // Profile header
-        items.push(ListItem::new(Line::from(vec![
-            Span::styled("📁 ", Style::default().fg(theme.accent)),
-            Span::styled(&profile.name, Style::default().fg(theme.highlight)),
-        ])));
-
-        // Profile tables
-        for (table_idx, table) in profile.tables.iter().enumerate() {
-            let is_last_table = table_idx == profile.tables.len() - 1;
-            let tree_prefix = if is_last_table { "└─ " } else { "├─ " };
-
-            // Table name
+    if let Some(profile_name) = selected_profile {
+        // Existing code for when a profile is selected...
+    } else {
+        // Show full profile tree when no profile is selected (compact version)
+        for (profile_idx, profile) in profile_tree.profiles.iter().enumerate() {
+            // Profile header - more compact
             items.push(ListItem::new(Line::from(vec![
-                Span::styled(format!("  {}", tree_prefix), Style::default().fg(theme.fg)),
-                Span::styled(&table.name, Style::default().fg(theme.fg)),
+                Span::styled("◆", Style::default().fg(theme.accent)),
+                Span::styled(&profile.name, Style::default().fg(theme.highlight)),
             ])));
 
-            // Dependencies
-            if !table.depends_on.is_empty() {
-                let dep_prefix = if is_last_table { "   " } else { "│  " };
-                let deps = table.depends_on.join(", ");
+            // Tables with compact prefixes
+            for (table_idx, table) in profile.tables.iter().enumerate() {
+                let is_last_table = table_idx == profile.tables.len() - 1;
+                let is_last_profile = profile_idx == profile_tree.profiles.len() - 1;
 
-                items.push(ListItem::new(Line::from(vec![
-                    Span::styled(format!("  {}   └─ ", dep_prefix), Style::default().fg(theme.secondary)),
-                    Span::styled(format!("→ {}", deps), Style::default().fg(theme.secondary)),
-                ])));
+                // Shorter prefix characters
+                let prefix = match (is_last_profile, is_last_table) {
+                    (true, true) => " └",
+                    (true, false) => " ├",
+                    (false, true) => "│└",
+                    (false, false) => "│├",
+                };
+
+                // Get table name without year prefix to save space
+                let display_name = if table.name.starts_with("2025_") {
+                    &table.name[5..] // Skip "2025_" prefix
+                } else {
+                    &table.name
+                };
+
+                let mut line = vec![
+                    Span::styled(prefix, Style::default().fg(theme.fg)),
+                    Span::styled(display_name, Style::default().fg(theme.fg)),
+                ];
+
+                // Show a simple indicator for dependencies instead of listing them
+                if !table.depends_on.is_empty() {
+                    line.push(Span::styled(
+                        "→",
+                        Style::default().fg(theme.secondary)
+                    ));
+                }
+
+                items.push(ListItem::new(Line::from(line)));
             }
+
+            // Compact separator between profiles
+            if profile_idx < profile_tree.profiles.len() - 1 {
+                items.push(ListItem::new(Line::from(
+                    Span::styled("│", Style::default().fg(theme.secondary))
+                )));
+            }
+        }
+
+        if profile_tree.profiles.is_empty() {
+            items.push(ListItem::new(Span::styled(
+                "No profiles",
+                Style::default().fg(theme.secondary)
+            )));
         }
     }
 
     let list = List::new(items)
         .block(sidebar_block)
         .highlight_style(Style::default().fg(theme.highlight))
-        .highlight_symbol(">>");
+        .highlight_symbol(">");
 
     f.render_widget(list, area);
 }

client/src/components/intro/intro.rs

@@ -7,7 +7,7 @@ use ratatui::{
     prelude::Margin,
     Frame,
 };
-use crate::config::colors::Theme;
+use crate::config::colors::themes::Theme;
 
 pub struct IntroState {
     pub selected_option: usize,

client/src/components/mod.rs

@@ -3,8 +3,10 @@ pub mod handlers;
 pub mod intro;
 pub mod admin;
 pub mod common;
+pub mod form;
 
 pub use handlers::*;
 pub use intro::*;
 pub use admin::*;
 pub use common::*;
+pub use form::*;

client/src/config/binds.rs

@@ -0,0 +1,7 @@
+// src/config/binds.rs
+ 
+pub mod config;
+pub mod key_sequences;
+
+pub use config::*;
+pub use key_sequences::*;

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,
@@ -355,13 +386,13 @@ impl Config {
 
         // Get string representations of the sequence
         let sequence_str = sequence.iter()
-            .map(|k| crate::config::key_sequences::key_to_string(k))
+            .map(|k| crate::config::binds::key_sequences::key_to_string(k))
             .collect::<Vec<String>>()
             .join("");
 
         // Add the missing sequence_plus definition
         let sequence_plus = sequence.iter()
-            .map(|k| crate::config::key_sequences::key_to_string(k))
+            .map(|k| crate::config::binds::key_sequences::key_to_string(k))
             .collect::<Vec<String>>()
             .join("+");
 
@@ -414,7 +445,7 @@ impl Config {
                 // Special case for + format in bindings
                 if binding.contains('+') {
                     let normalized_sequence = sequence.iter()
-                        .map(|k| crate::config::key_sequences::key_to_string(k))
+                        .map(|k| crate::config::binds::key_sequences::key_to_string(k))
                         .collect::<Vec<String>>();
 
                     let binding_parts: Vec<&str> = binding.split('+').collect();
@@ -442,7 +473,7 @@ impl Config {
 
         // Get string representation of the sequence
         let sequence_str = sequence.iter()
-            .map(|k| crate::config::key_sequences::key_to_string(k))
+            .map(|k| crate::config::binds::key_sequences::key_to_string(k))
             .collect::<Vec<String>>()
             .join("");
 
@@ -491,7 +522,7 @@ impl Config {
                 if binding.contains('+') {
                     let binding_parts: Vec<&str> = binding.split('+').collect();
                     let sequence_parts = sequence.iter()
-                        .map(|k| crate::config::key_sequences::key_to_string(k))
+                        .map(|k| crate::config::binds::key_sequences::key_to_string(k))
                         .collect::<Vec<String>>();
 
                     if binding_parts.len() > sequence_parts.len() {

client/src/config/colors.rs

@@ -1,68 +1,4 @@
-// src/client/colors.rs
-use ratatui::style::Color;
+// src/config/colors.rs
+pub mod themes;
 
-#[derive(Debug, Clone)]
-pub struct Theme {
-    pub bg: Color,
-    pub fg: Color,
-    pub accent: Color,
-    pub secondary: Color,
-    pub highlight: Color,
-    pub warning: Color,
-    pub border: Color,
-}
-
-impl Theme {
-    pub fn from_str(theme_name: &str) -> Self {
-        match theme_name.to_lowercase().as_str() {
-            "dark" => Self::dark(),
-            "high_contrast" => Self::high_contrast(),
-            _ => Self::light(),
-        }
-    }
-
-    // Default light theme
-    pub fn light() -> Self {
-        Self {
-            bg: Color::Rgb(245, 245, 245), // Light gray
-            fg: Color::Rgb(64, 64, 64),    // Dark gray
-            accent: Color::Rgb(173, 216, 230), // Pastel blue
-            secondary: Color::Rgb(255, 165, 0), // Orange for secondary
-            highlight: Color::Rgb(152, 251, 152), // Pastel green
-            warning: Color::Rgb(255, 182, 193), // Pastel pink
-            border: Color::Rgb(220, 220, 220), // Light gray border
-        }
-    }
-
-    // High-contrast dark theme
-    pub fn dark() -> Self {
-        Self {
-            bg: Color::Rgb(30, 30, 30),     // Dark background
-            fg: Color::Rgb(255, 255, 255),  // White text
-            accent: Color::Rgb(0, 191, 255), // Bright blue
-            secondary: Color::Rgb(255, 215, 0), // Gold for secondary
-            highlight: Color::Rgb(50, 205, 50), // Bright green
-            warning: Color::Rgb(255, 99, 71), // Bright red
-            border: Color::Rgb(100, 100, 100), // Medium gray border
-        }
-    }
-
-    // High-contrast light theme
-    pub fn high_contrast() -> Self {
-        Self {
-            bg: Color::Rgb(255, 255, 255), // White background
-            fg: Color::Rgb(0, 0, 0),       // Black text
-            accent: Color::Rgb(0, 0, 255), // Blue
-            secondary: Color::Rgb(255, 140, 0), // Dark orange for secondary
-            highlight: Color::Rgb(0, 128, 0), // Green
-            warning: Color::Rgb(255, 0, 0), // Red
-            border: Color::Rgb(0, 0, 0),   // Black border
-        }
-    }
-}
-
-impl Default for Theme {
-    fn default() -> Self {
-        Self::light() // Default to light theme
-    }
-}
+pub use themes::*;

client/src/config/colors/themes.rs

@@ -0,0 +1,68 @@
+// src/client/themes/colors.rs
+use ratatui::style::Color;
+
+#[derive(Debug, Clone)]
+pub struct Theme {
+    pub bg: Color,
+    pub fg: Color,
+    pub accent: Color,
+    pub secondary: Color,
+    pub highlight: Color,
+    pub warning: Color,
+    pub border: Color,
+}
+
+impl Theme {
+    pub fn from_str(theme_name: &str) -> Self {
+        match theme_name.to_lowercase().as_str() {
+            "dark" => Self::dark(),
+            "high_contrast" => Self::high_contrast(),
+            _ => Self::light(),
+        }
+    }
+
+    // Default light theme
+    pub fn light() -> Self {
+        Self {
+            bg: Color::Rgb(245, 245, 245), // Light gray
+            fg: Color::Rgb(64, 64, 64),    // Dark gray
+            accent: Color::Rgb(173, 216, 230), // Pastel blue
+            secondary: Color::Rgb(255, 165, 0), // Orange for secondary
+            highlight: Color::Rgb(152, 251, 152), // Pastel green
+            warning: Color::Rgb(255, 182, 193), // Pastel pink
+            border: Color::Rgb(220, 220, 220), // Light gray border
+        }
+    }
+
+    // High-contrast dark theme
+    pub fn dark() -> Self {
+        Self {
+            bg: Color::Rgb(30, 30, 30),     // Dark background
+            fg: Color::Rgb(255, 255, 255),  // White text
+            accent: Color::Rgb(0, 191, 255), // Bright blue
+            secondary: Color::Rgb(255, 215, 0), // Gold for secondary
+            highlight: Color::Rgb(50, 205, 50), // Bright green
+            warning: Color::Rgb(255, 99, 71), // Bright red
+            border: Color::Rgb(100, 100, 100), // Medium gray border
+        }
+    }
+
+    // High-contrast light theme
+    pub fn high_contrast() -> Self {
+        Self {
+            bg: Color::Rgb(255, 255, 255), // White background
+            fg: Color::Rgb(0, 0, 0),       // Black text
+            accent: Color::Rgb(0, 0, 255), // Blue
+            secondary: Color::Rgb(255, 140, 0), // Dark orange for secondary
+            highlight: Color::Rgb(0, 128, 0), // Green
+            warning: Color::Rgb(255, 0, 0), // Red
+            border: Color::Rgb(0, 0, 0),   // Black border
+        }
+    }
+}
+
+impl Default for Theme {
+    fn default() -> Self {
+        Self::light() // Default to light theme
+    }
+}

client/src/config/mod.rs

@@ -1,4 +1,4 @@
 // src/config/mod.rs
+
+pub mod binds;
 pub mod colors;
-pub mod config;
-pub mod key_sequences;

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,9 +1,83 @@
-// src/modes/handlers/common.rs
+// src/modes/canvas/common.rs
 
+use crossterm::event::{KeyEvent};
+use crate::config::binds::config::Config;
 use crate::tui::terminal::grpc_client::GrpcClient;
+use crate::tui::terminal::core::TerminalCore;
+use crate::tui::controls::commands::CommandHandler;
 use crate::ui::handlers::form::FormState;
+use crate::state::state::AppState;
 use common::proto::multieko2::adresar::{PostAdresarRequest, PutAdresarRequest};
 
+/// Main handler for common core actions
+pub async fn handle_core_action(
+    action: &str,
+    form_state: &mut FormState,
+    grpc_client: &mut GrpcClient,
+    command_handler: &mut CommandHandler,
+    terminal: &mut TerminalCore,
+    app_state: &mut AppState,
+    current_position: &mut u64,
+    total_count: u64,
+) -> Result<(bool, String), Box<dyn std::error::Error>> {
+    match action {
+        "save" => {
+            let message = save(
+                form_state,
+                grpc_client,
+                &mut app_state.ui.is_saved,
+                current_position,
+                total_count,
+            ).await?;
+            Ok((false, message))
+        },
+        "force_quit" => {
+            terminal.cleanup()?;
+            Ok((true, "Force exiting without saving.".to_string()))
+        },
+        "save_and_quit" => {
+            let message = save(
+                form_state,
+                grpc_client,
+                &mut app_state.ui.is_saved,
+                current_position,
+                total_count,
+            ).await?;
+            terminal.cleanup()?;
+            Ok((true, format!("{}. Exiting application.", message)))
+        },
+        "revert" => {
+            let message = revert(
+                form_state,
+                grpc_client,
+                current_position,
+                total_count,
+            ).await?;
+            Ok((false, message))
+        },
+        // We should never hit this case with proper filtering
+        _ => Ok((false, format!("Core action not handled: {}", action))),
+    }
+}
+
+/// Helper function to check if a key event should trigger a core action
+pub fn is_core_action(config: &Config, key_code: crossterm::event::KeyCode, modifiers: crossterm::event::KeyModifiers) -> Option<String> {
+    // Check for core application actions (save, quit, etc.)
+    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 Some(action.to_string())
+            },
+            _ => {} // Other actions are handled by their respective mode handlers
+        }
+    }
+    None
+}
+
 /// Shared logic for saving the current form state
 pub async fn save(
     form_state: &mut FormState,
@@ -65,64 +139,6 @@ pub async fn save(
     Ok(message)
 }
 
-/// Shared logic for force quitting the application
-pub fn force_quit() -> (bool, String) {
-    (true, "Force quitting application".to_string())
-}
-
-/// Shared logic for saving and quitting
-pub async fn save_and_quit(
-    form_state: &mut FormState,
-    grpc_client: &mut GrpcClient,
-    current_position: &mut u64,
-    total_count: u64,
-) -> Result<(bool, String), Box<dyn std::error::Error>> {
-    let is_new = *current_position == total_count + 1;
-
-    if is_new {
-        let post_request = PostAdresarRequest {
-            firma: form_state.values[0].clone(),
-            kz: form_state.values[1].clone(),
-            drc: form_state.values[2].clone(),
-            ulica: form_state.values[3].clone(),
-            psc: form_state.values[4].clone(),
-            mesto: form_state.values[5].clone(),
-            stat: form_state.values[6].clone(),
-            banka: form_state.values[7].clone(),
-            ucet: form_state.values[8].clone(),
-            skladm: form_state.values[9].clone(),
-            ico: form_state.values[10].clone(),
-            kontakt: form_state.values[11].clone(),
-            telefon: form_state.values[12].clone(),
-            skladu: form_state.values[13].clone(),
-            fax: form_state.values[14].clone(),
-        };
-        let _ = grpc_client.post_adresar(post_request).await?;
-    } else {
-        let put_request = PutAdresarRequest {
-            id: form_state.id,
-            firma: form_state.values[0].clone(),
-            kz: form_state.values[1].clone(),
-            drc: form_state.values[2].clone(),
-            ulica: form_state.values[3].clone(),
-            psc: form_state.values[4].clone(),
-            mesto: form_state.values[5].clone(),
-            stat: form_state.values[6].clone(),
-            banka: form_state.values[7].clone(),
-            ucet: form_state.values[8].clone(),
-            skladm: form_state.values[9].clone(),
-            ico: form_state.values[10].clone(),
-            kontakt: form_state.values[11].clone(),
-            telefon: form_state.values[12].clone(),
-            skladu: form_state.values[13].clone(),
-            fax: form_state.values[14].clone(),
-        };
-        let _ = grpc_client.put_adresar(put_request).await?;
-    }
-
-    Ok((true, "Saved and exiting application".to_string()))
-}
-
 /// Discard changes since last save
 pub async fn revert(
     form_state: &mut 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::config::Config;
+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/canvas/read_only.rs

@@ -1,9 +1,9 @@
 // src/modes/handlers/read_only.rs
 
 use crossterm::event::{KeyEvent};
-use crate::config::config::Config;
+use crate::config::binds::config::Config;
 use crate::ui::handlers::form::FormState;
-use crate::config::key_sequences::KeySequenceTracker;
+use crate::config::binds::key_sequences::KeySequenceTracker;
 use crate::tui::terminal::grpc_client::GrpcClient;
 
 #[derive(PartialEq)]

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

@@ -2,9 +2,13 @@
 
 use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
 use crate::tui::terminal::grpc_client::GrpcClient;
-use crate::config::config::Config;
+use crate::config::binds::config::Config;
 use crate::ui::handlers::form::FormState;
-use super::common;
+use crate::tui::controls::commands::CommandHandler;
+use crate::tui::terminal::core::TerminalCore;
+use crate::modes::{
+    canvas::{common},
+};
 
 pub async fn handle_command_event(
     key: KeyEvent,
@@ -13,7 +17,8 @@ pub async fn handle_command_event(
     command_input: &mut String,
     command_message: &mut String,
     grpc_client: &mut GrpcClient,
-    is_saved: &mut bool,
+    command_handler: &mut CommandHandler,
+    terminal: &mut TerminalCore,
     current_position: &mut u64,
     total_count: u64,
 ) -> Result<(bool, String, bool), Box<dyn std::error::Error>> {
@@ -35,7 +40,8 @@ pub async fn handle_command_event(
             command_input,
             command_message,
             grpc_client,
-            is_saved,
+            command_handler,
+            terminal,
             current_position,
             total_count,
         ).await;
@@ -66,7 +72,8 @@ async fn process_command(
     command_input: &mut String,
     command_message: &mut String,
     grpc_client: &mut GrpcClient,
-    is_saved: &mut bool,
+    command_handler: &mut CommandHandler,
+    terminal: &mut TerminalCore,
     current_position: &mut u64,
     total_count: u64,
 ) -> Result<(bool, String, bool), Box<dyn std::error::Error>> {
@@ -82,32 +89,24 @@ async fn process_command(
         .unwrap_or("unknown");
 
     match action {
+        "force_quit" | "save_and_quit" | "quit" => {
+            let (should_exit, message) = command_handler
+                .handle_command(action, terminal)
+                .await?;
+            command_input.clear();
+            Ok((should_exit, message, true))
+        },
         "save" => {
             let message = common::save(
                 form_state,
                 grpc_client,
-                is_saved,
+                &mut command_handler.is_saved,
                 current_position,
                 total_count,
             ).await?;
             command_input.clear();
             return Ok((false, message, true));
         },
-        "force_quit" => {
-            let (should_exit, message) = common::force_quit();
-            command_input.clear();
-            return Ok((should_exit, message, true));
-        },
-        "save_and_quit" => {
-            let (should_exit, message) = common::save_and_quit(
-                form_state,
-                grpc_client,
-                current_position,
-                total_count,
-            ).await?;
-            command_input.clear();
-            return Ok((should_exit, message, true));
-        },
         "revert" => {
             let message = common::revert(
                 form_state,

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,175 @@
+// src/modes/general/navigation.rs
+
+use crossterm::event::KeyEvent;
+use crate::config::binds::config::Config;
+use crate::state::state::AppState;
+use crate::ui::handlers::form::FormState;
+
+pub async fn handle_navigation_event(
+    key: KeyEvent,
+    config: &Config,
+    form_state: &mut FormState,
+    app_state: &mut AppState,
+    command_mode: &mut bool,
+    command_input: &mut String,
+    command_message: &mut String,
+) -> Result<(bool, String), Box<dyn std::error::Error>> {
+    if let Some(action) = config.get_general_action(key.code, key.modifiers) {
+        match action {
+            "move_up" => {
+                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
+                };
+                move_down(app_state, item_count);
+                return Ok((false, String::new()));
+            }
+            "next_option" => {
+                next_option(app_state, 2); // Intro has 2 options
+                return Ok((false, String::new()));
+            }
+            "previous_option" => {
+                previous_option(app_state);
+                return Ok((false, String::new()));
+            }
+            "select" => {
+                select(app_state);
+                return Ok((false, "Selected".to_string()));
+            }
+            "toggle_sidebar" => {
+                toggle_sidebar(app_state);
+                return Ok((false, format!("Sidebar {}",
+                    if app_state.ui.show_sidebar { "shown" } else { "hidden" }
+                )));
+            }
+            "next_field" => {
+                next_field(form_state);
+                return Ok((false, String::new()));
+            }
+            "prev_field" => {
+                prev_field(form_state);
+                return Ok((false, String::new()));
+            }
+            "enter_command_mode" => {
+                handle_enter_command_mode(command_mode, command_input, command_message);
+                return Ok((false, String::new()));
+            }
+            _ => {}
+        }
+    }
+    Ok((false, String::new()))
+}
+
+pub fn move_up(app_state: &mut AppState) {
+    if app_state.ui.show_intro {
+        app_state.ui.intro_state.previous_option();
+    } else if app_state.ui.show_admin {
+        // Assuming profile_tree.profiles is the list we're navigating
+        let profile_count = app_state.profile_tree.profiles.len();
+        if profile_count == 0 {
+            return;
+        }
+
+        // Use general state for tracking selection in admin panel
+        if app_state.general.selected_item == 0 {
+            app_state.general.selected_item = profile_count - 1;
+        } else {
+            app_state.general.selected_item = app_state.general.selected_item.saturating_sub(1);
+        }
+    }
+}
+
+pub fn move_down(app_state: &mut AppState, item_count: usize) {
+    if app_state.ui.show_intro {
+        app_state.ui.intro_state.next_option();
+    } else if app_state.ui.show_admin {
+        // Assuming profile_tree.profiles is the list we're navigating
+        let profile_count = app_state.profile_tree.profiles.len();
+        if profile_count == 0 {
+            return;
+        }
+
+        app_state.general.selected_item = (app_state.general.selected_item + 1) % profile_count;
+    }
+}
+
+pub fn next_option(app_state: &mut AppState, option_count: usize) {
+    if app_state.ui.show_intro {
+        app_state.ui.intro_state.next_option();
+    } else {
+        // For other screens that might have options
+        app_state.general.current_option = (app_state.general.current_option + 1) % option_count;
+    }
+}
+
+pub fn previous_option(app_state: &mut AppState) {
+    if app_state.ui.show_intro {
+        app_state.ui.intro_state.previous_option();
+    } else {
+        // For other screens that might have options
+        if app_state.general.current_option == 0 {
+            // We'd need the option count here, but since it's not passed we can't wrap around correctly
+            // For now, just stay at 0
+        } else {
+            app_state.general.current_option -= 1;
+        }
+    }
+}
+
+pub fn select(app_state: &mut AppState) {
+    if app_state.ui.show_intro {
+        // Handle selection in intro screen
+        if app_state.ui.intro_state.selected_option == 0 {
+            // First option selected - show form
+            app_state.ui.show_form = true;
+            app_state.ui.show_admin = false;
+        } else {
+            // Second option selected - show admin
+            app_state.ui.show_form = false;
+            app_state.ui.show_admin = true;
+        }
+        app_state.ui.show_intro = false;
+    } else if app_state.ui.show_admin {
+        // Handle selection in admin panel
+        let profiles = &app_state.profile_tree.profiles;
+        if !profiles.is_empty() && app_state.general.selected_item < profiles.len() {
+            // Set the selected profile
+            app_state.selected_profile = Some(profiles[app_state.general.selected_item].name.clone());
+        }
+    }
+}
+
+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() {
+        if form_state.current_field == 0 {
+            form_state.current_field = form_state.fields.len() - 1;
+        } else {
+            form_state.current_field -= 1;
+        }
+    }
+}
+
+pub fn handle_enter_command_mode(
+    command_mode: &mut bool,
+    command_input: &mut String,
+    command_message: &mut String
+) {
+    *command_mode = true;
+    command_input.clear();
+    command_message.clear();
+}

client/src/modes/handlers.rs

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

client/src/modes/handlers/event.rs

@@ -1,17 +1,21 @@
 // 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,
     grpc_client::GrpcClient,
-    commands::CommandHandler,
 };
-use crate::config::config::Config;
+use crate::tui::controls::commands::CommandHandler;
+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::config::key_sequences::KeySequenceTracker;
-use super::common;
+use crate::modes::{
+    common::{command_mode},
+    canvas::{edit, read_only, common},
+    general::navigation,
+};
+use crate::config::binds::key_sequences::KeySequenceTracker;
+use crate::modes::handlers::mode_manager::{ModeManager, AppMode};
 
 pub struct EventHandler {
     pub command_mode: bool,
@@ -47,180 +51,198 @@ 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 {
-            if let Event::Key(key) = event {
-                match key.code {
-                    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()));
-        }
+        // Determine current mode based on app state and event handler state
+        let current_mode = ModeManager::derive_mode(app_state, self);
+        app_state.update_mode(current_mode);
 
         if let Event::Key(key) = event {
             let key_code = key.code;
             let modifiers = key.modifiers;
 
-            if UiStateHandler::toggle_sidebar(
-                &mut app_state.ui,
-                config,
-                key_code,
-                modifiers,
-            ) {
+            // Handle common actions across all modes
+            if UiStateHandler::toggle_sidebar(&mut app_state.ui, 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(
-                &config.keybindings.common,
-                key_code,
-                modifiers
-            ) {
-                match action {
-                    "save" => {
-                        let message = common::save(
-                            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));
-                    },
-                    _ => {}
-                }
-            }
+            // Mode-specific handling
+            match current_mode {
+                AppMode::General => {
+                    return navigation::handle_navigation_event(
+                        key,
+                        config,
+                        form_state,
+                        app_state,
+                        &mut self.command_mode,
+                        &mut self.command_input,
+                        &mut self.command_message,
+                    ).await;
+                },
 
-            if self.command_mode {
-                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));
-            }
-
-            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();
+                AppMode::ReadOnly => {
+                    // Check for mode transitions first
+                    if config.is_enter_edit_mode_before(key_code, modifiers) &&
+                       ModeManager::can_enter_edit_mode(current_mode) {
+                        self.is_edit_mode = true;
+                        self.edit_mode_cooldown = true;
+                        self.command_message = "Edit mode".to_string();
+                        terminal.set_cursor_style(SetCursorStyle::BlinkingBar)?;
                         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;
+                    if config.is_enter_edit_mode_after(key_code, modifiers) &&
+                       ModeManager::can_enter_edit_mode(current_mode) {
+                        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 += 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(
-                    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));
-            } 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()));
+                    // Check for entering command mode
+                    if let Some(action) = config.get_read_only_action_for_key(key_code, modifiers) {
+                        if action == "enter_command_mode" && ModeManager::can_enter_command_mode(current_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) {
-                    self.is_edit_mode = true;
-                    self.edit_mode_cooldown = true;
-                    self.command_message = "Edit mode".to_string();
-                    terminal.set_cursor_style(SetCursorStyle::BlinkingBar)?;
-                    return Ok((false, self.command_message.clone()));
-                }
-
-                if config.is_enter_edit_mode_after(key_code, modifiers) {
-                    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 += 1;
-                        self.ideal_cursor_column = form_state.current_cursor_pos;
+                    // 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 common::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
+                        }
                     }
-                    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(
-                    key,
-                    config,
-                    form_state,
-                    &mut self.key_sequence_tracker,
-                    current_position,
-                    total_count,
-                    grpc_client,
-                    &mut self.command_message,
-                    &mut self.edit_mode_cooldown,
-                    &mut self.ideal_cursor_column,
-                ).await;
+                    // Let read_only mode handle its own actions (including navigation from common bindings)
+                    return read_only::handle_read_only_event(
+                        key,
+                        config,
+                        form_state,
+                        &mut self.key_sequence_tracker,
+                        current_position,
+                        total_count,
+                        grpc_client,
+                        &mut self.command_message,
+                        &mut self.edit_mode_cooldown,
+                        &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 common::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,
+                        command_handler,
+                        terminal,
+                        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()))
     }
+
+
 }

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 {
@@ -16,9 +25,12 @@ pub struct AppState {
     pub total_count: u64,
     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 {
@@ -31,7 +43,13 @@ impl AppState {
             total_count: 0,
             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,
+            },
         })
     }
 
@@ -43,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 {
@@ -52,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/tui/controls.rs

@@ -0,0 +1,5 @@
+// src/tui/controls.rs
+
+pub mod commands;
+
+pub use commands::*;

client/src/tui/controls/commands.rs

@@ -1,9 +1,8 @@
-// src/tui/terminal/commands.rs
-
+// src/tui/controls/commands.rs
 use crate::tui::terminal::core::TerminalCore;
 
 pub struct CommandHandler {
-    is_saved: bool,
+    pub is_saved: bool,
 }
 
 impl CommandHandler {
@@ -24,7 +23,10 @@ impl CommandHandler {
         }
     }
 
-    async fn handle_quit(&self, terminal: &mut TerminalCore) -> Result<(bool, String), Box<dyn std::error::Error>> {
+    async fn handle_quit(
+        &self,
+        terminal: &mut TerminalCore,
+    ) -> Result<(bool, String), Box<dyn std::error::Error>> {
         if self.is_saved {
             terminal.cleanup()?;
             Ok((true, "Exiting.".into()))
@@ -33,12 +35,18 @@ impl CommandHandler {
         }
     }
 
-    async fn handle_force_quit(&self, terminal: &mut TerminalCore) -> Result<(bool, String), Box<dyn std::error::Error>> {
+    async fn handle_force_quit(
+        &self,
+        terminal: &mut TerminalCore,
+    ) -> Result<(bool, String), Box<dyn std::error::Error>> {
         terminal.cleanup()?;
         Ok((true, "Force exiting without saving.".into()))
     }
 
-    async fn handle_save_quit(&mut self, terminal: &mut TerminalCore) -> Result<(bool, String), Box<dyn std::error::Error>> {
+    async fn handle_save_quit(
+        &mut self,
+        terminal: &mut TerminalCore,
+    ) -> Result<(bool, String), Box<dyn std::error::Error>> {
         self.is_saved = true;
         terminal.cleanup()?;
         Ok((true, "State saved. Exiting.".into()))

client/src/tui/mod.rs

@@ -1,2 +1,4 @@
 // src/tui/mod.rs
 pub mod terminal;
+pub mod controls;
+

client/src/tui/terminal.rs

@@ -2,10 +2,8 @@
 
 pub mod core;
 pub mod grpc_client;
-pub mod commands;
 pub mod event_reader;
 
 pub use core::TerminalCore;
 pub use grpc_client::GrpcClient;
-pub use commands::CommandHandler;
 pub use event_reader::EventReader;

client/src/ui/handlers/form.rs

@@ -1,5 +1,5 @@
 // src/client/ui/handlers/form.rs
-use crate::config::colors::Theme;
+use crate::config::colors::themes::Theme;
 use ratatui::layout::Rect;
 use ratatui::Frame;
 
@@ -38,7 +38,7 @@ impl FormState {
         let fields: Vec<&str> = self.fields.iter().map(|s| s.as_str()).collect();
         let values: Vec<&String> = self.values.iter().collect();
 
-        crate::components::handlers::form::render_form(
+        crate::components::form::form::render_form(
             f,
             area,
             self,

client/src/ui/handlers/rat_state.rs

@@ -1,6 +1,6 @@
 // src/ui/handlers/rat_state.rs
 use crossterm::event::{KeyCode, KeyModifiers};
-use crate::config::config::Config;
+use crate::config::binds::config::Config;
 use crate::state::state::UiState;
 
 pub struct UiStateHandler;

client/src/ui/handlers/render.rs

@@ -4,10 +4,12 @@ use crate::components::{
     render_background,
     render_command_line,
     render_status_line,
-    handlers::{sidebar::{self, calculate_sidebar_layout}, admin_panel::AdminPanelState, form::render_form},
+    handlers::sidebar::{self, calculate_sidebar_layout},
+    form::form::render_form,
     intro::{intro},
+    admin::{admin_panel::AdminPanelState},
 };
-use crate::config::colors::Theme;
+use crate::config::colors::themes::Theme;
 use ratatui::layout::{Constraint, Direction, Layout};
 use ratatui::Frame;
 use super::form::FormState;
@@ -25,8 +27,7 @@ pub fn render_ui(
     command_mode: bool,
     command_message: &str,
     app_state: &AppState,
-    intro_state: &intro::IntroState,
-    admin_panel_state: &AdminPanelState,
+    // intro_state parameter removed
 ) {
     render_background(f, f.area(), theme);
 
@@ -41,17 +42,47 @@ pub fn render_ui(
 
     let main_content_area = root[0];
     if app_state.ui.show_intro {
-        intro_state.render(f, main_content_area, theme);
+        // Use app_state's intro_state directly
+        app_state.ui.intro_state.render(f, main_content_area, theme);
     } else if app_state.ui.show_admin {
-        admin_panel_state.render(f, main_content_area, theme);
-    } else {
+        // Create temporary AdminPanelState for rendering
+        let mut admin_state = AdminPanelState::new(
+            app_state.profile_tree.profiles
+                .iter()
+                .map(|p| p.name.clone())
+                .collect()
+        );
+
+        // Set the selected item - FIXED
+        if !admin_state.profiles.is_empty() {
+            let selected_index = std::cmp::min(
+                app_state.general.selected_item,
+                admin_state.profiles.len() - 1
+            );
+            admin_state.list_state.select(Some(selected_index));
+        }
+
+        admin_state.render(
+            f,
+            main_content_area,
+            theme,
+            &app_state.profile_tree,
+            &app_state.selected_profile,
+        );
+    } else if app_state.ui.show_form {
         let (sidebar_area, form_area) = calculate_sidebar_layout(
             app_state.ui.show_sidebar,
             main_content_area
         );
 
         if let Some(sidebar_rect) = sidebar_area {
-            sidebar::render_sidebar(f, sidebar_rect, theme, &app_state.profile_tree);
+            sidebar::render_sidebar(
+                f,
+                sidebar_rect,
+                theme,
+                &app_state.profile_tree,
+                &app_state.selected_profile
+            );
         }
 
         // This change makes the form stay stationary when toggling sidebar
@@ -94,6 +125,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

@@ -1,15 +1,15 @@
-// src/client/ui/handlers/ui.rs
+// src/ui/handlers/ui.rs
 
 use crate::tui::terminal::TerminalCore;
 use crate::tui::terminal::GrpcClient;
-use crate::tui::terminal::CommandHandler;
+use crate::tui::controls::CommandHandler;
 use crate::tui::terminal::EventReader;
-use crate::config::colors::Theme;
-use crate::config::config::Config;
+use crate::config::colors::themes::Theme;
+use crate::config::binds::config::Config;
 use crate::ui::handlers::{form::FormState, render::render_ui};
 use crate::modes::handlers::event::EventHandler;
 use crate::state::state::AppState;
-use crate::components::handlers::{admin_panel::AdminPanelState};
+use crate::components::admin::{admin_panel::AdminPanelState};
 use crate::components::intro::{intro::IntroState};
 
 pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
@@ -19,10 +19,22 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     let mut command_handler = CommandHandler::new();
     let theme = Theme::from_str(&config.colors.theme);
     let mut intro_state = IntroState::new();
-    let admin_panel_state = AdminPanelState::new();
+
+    // Initialize app_state first
+    let mut app_state = AppState::new()?;
+
+    // Fetch profile tree and table structure
+    let profile_tree = grpc_client.get_profile_tree().await?;
+    app_state.profile_tree = profile_tree;
+
+    // Now create admin panel with profiles from app_state
+    if intro_state.selected_option == 1 {
+        app_state.ui.show_admin = true;
+        app_state.general.selected_item = 0;
+        app_state.general.current_option = 0;
+    }
 
     // Fetch table structure at startup (one-time)
-    // TODO: Later, consider implementing a live update for table structure changes.
     let table_structure = grpc_client.get_table_structure().await?;
 
     // Extract the column names from the response
@@ -35,13 +47,9 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     // Initialize FormState with dynamic fields
     let mut form_state = FormState::new(column_names);
 
-        // Fetch profile tree and table structure
-    let profile_tree = grpc_client.get_profile_tree().await?;
     // The rest of your UI initialization remains the same
     let mut event_handler = EventHandler::new();
     let event_reader = EventReader::new();
-    let mut app_state = AppState::new()?;
-    app_state.profile_tree = profile_tree;
 
     // Fetch the total count of Adresar entries
     let total_count = grpc_client.get_adresar_count().await?;
@@ -66,8 +74,6 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
                 event_handler.command_mode,
                 &event_handler.command_message,
                 &app_state,
-                &intro_state,
-                &admin_panel_state,
             );
         })?;
 
@@ -85,7 +91,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;
@@ -100,7 +105,6 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
             };
             form_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
 
-
             // Ensure position never exceeds total_count + 1
             if app_state.current_position > total_count + 1 {
                 app_state.current_position = total_count + 1;