buffer working

client/config.toml

@@ -10,6 +10,7 @@ next_option = ["l", "Right"]
 previous_option = ["h", "Left"]
 select = ["Enter"]
 toggle_sidebar = ["ctrl+t"]
+toggle_buffer_list = ["ctrl+b"]
 next_field = ["Tab"]
 prev_field = ["Shift+Tab"]
 
@@ -24,6 +25,7 @@ save_and_quit = ["ctrl+shift+s"]
 move_up = ["Up"]
 move_down = ["Down"]
 toggle_sidebar = ["ctrl+t"]
+toggle_buffer_list = ["ctrl+b"]
 
 # MODE SPECIFIC
 # READ ONLY MODE

client/src/components/admin/admin_panel.rs

@@ -1,118 +1,137 @@
 // src/components/admin/admin_panel.rs
 
+use crate::config::colors::themes::Theme;
+use crate::state::pages::auth::AuthState;
+use crate::state::pages::admin::AdminState;
+use common::proto::multieko2::table_definition::ProfileTreeResponse;
 use ratatui::{
-    widgets::{Block, BorderType, Borders, List, ListItem, ListState, Paragraph},
+    layout::{Alignment, Constraint, Direction, Layout, Rect},
     style::Style,
     text::{Line, Span, Text},
-    layout::{Alignment, Constraint, Direction, Layout, Rect},
+    widgets::{Block, BorderType, Borders, List, ListItem, Paragraph, Wrap},
     Frame,
 };
-use common::proto::multieko2::table_definition::ProfileTreeResponse;
-use crate::config::colors::themes::Theme;
 
-pub struct AdminPanelState {
-    pub list_state: ListState,
-    pub profiles: Vec<String>,
+/// Renders the view specific to admin users.
+fn render_admin_panel_admin(f: &mut Frame, content_chunks: &[Rect], theme: &Theme) {
+    // Admin-specific view placeholder
+    let admin_message = Paragraph::new("Admin-specific view. Profile selection not applicable.")
+        .style(Style::default().fg(theme.fg))
+        .alignment(Alignment::Center);
+    // Render only in the right pane for now, leaving left empty
+    f.render_widget(admin_message, content_chunks[1]);
 }
 
-impl AdminPanelState {
-    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_admin_panel(
+    f: &mut Frame,
+    auth_state: &AuthState,
+    admin_state: &AdminState,
+    area: Rect,
+    theme: &Theme,
+    profile_tree: &ProfileTreeResponse,
+    selected_profile: &Option<String>,
+) {
+    let block = Block::default()
+        .borders(Borders::ALL)
+        .border_type(BorderType::Rounded)
+        .border_style(Style::default().fg(theme.accent))
+        .style(Style::default().bg(theme.bg));
+
+    let inner_area = block.inner(area);
+    f.render_widget(block, area);
+
+    let chunks = Layout::default()
+        .direction(Direction::Vertical)
+        .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_widget = Paragraph::new(title).alignment(Alignment::Center);
+    f.render_widget(title_widget, chunks[0]);
+
+    // Content
+    let content_chunks = Layout::default()
+        .direction(Direction::Horizontal)
+        .constraints([Constraint::Percentage(30), Constraint::Percentage(70)])
+        .split(chunks[1]);
+
+    if auth_state.role.as_deref() != Some("admin") {
+        render_admin_panel_non_admin(
+            f,
+            admin_state,
+            &content_chunks,
+            theme,
+            profile_tree,
+            selected_profile,
+        );
+    } else {
+        render_admin_panel_admin(f, &content_chunks, 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)
-            .border_style(Style::default().fg(theme.accent))
-            .style(Style::default().bg(theme.bg));
-
-        let inner_area = block.inner(area);
-        f.render_widget(block, area);
-
-        let chunks = Layout::default()
-            .direction(Direction::Vertical)
-            .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_widget = Paragraph::new(title).alignment(Alignment::Center);
-        f.render_widget(title_widget, chunks[0]);
-
-        // 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![
+/// Renders the view for non-admin users (profile list and details).
+fn render_admin_panel_non_admin(
+    f: &mut Frame,
+    admin_state: &AdminState,
+    content_chunks: &[Rect],
+    theme: &Theme,
+    profile_tree: &ProfileTreeResponse,
+    selected_profile: &Option<String>,
+) {
+    // Profile list - Use data from admin_state
+    let items: Vec<ListItem> = admin_state
+        .profiles
+        .iter()
+        .map(|p| {
+            ListItem::new(Line::from(vec![
                 Span::styled(
                     if Some(p) == selected_profile.as_ref() { "✓ " } else { "  " },
-                    Style::default().fg(theme.accent)
+                    Style::default().fg(theme.accent),
                 ),
                 Span::styled(p, Style::default().fg(theme.fg)),
-            ])))
-            .collect();
+            ]))
+        })
+        .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);
+    let list = List::new(items)
+        .block(Block::default().title("Profiles"))
+        .highlight_style(Style::default().bg(theme.highlight).fg(theme.bg));
 
-        // 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)),
-            ]));
+    let mut list_state_clone = admin_state.list_state.clone();
+    f.render_stateful_widget(list, content_chunks[0], &mut list_state_clone);
 
-            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));
+    // Profile details - Use selection info from admin_state
+    if let Some(profile) = admin_state
+        .get_selected_index()
+        .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),
+                ));
             }
-
-            let details_widget = Paragraph::new(text)
-                .block(Block::default().title("Details"));
-            f.render_widget(details_widget, content_chunks[1]);
+            text.lines.push(Line::from(line));
         }
+
+        let details_widget = Paragraph::new(text)
+            .block(Block::default().title("Details"))
+            .wrap(Wrap { trim: true });
+        f.render_widget(details_widget, content_chunks[1]);
     }
 }

client/src/components/auth/login.rs

@@ -2,9 +2,9 @@
 
 use crate::{
     config::colors::themes::Theme,
-    state::pages::auth::AuthState,
+    state::pages::auth::LoginState,
     components::common::dialog,
-    state::state::AppState,
+    state::app::state::AppState,
 };
 use ratatui::{
     layout::{Alignment, Constraint, Direction, Layout, Rect, Margin},
@@ -17,7 +17,7 @@ pub fn render_login(
     f: &mut Frame,
     area: Rect,
     theme: &Theme,
-    state: &AuthState,
+    login_state: &LoginState,
     app_state: &AppState,
     is_edit_mode: bool,
 ) {
@@ -50,16 +50,16 @@ pub fn render_login(
     crate::components::handlers::canvas::render_canvas(
         f,
         chunks[0],
-        state,
+        login_state,
         &["Username/Email", "Password"],
-        &state.current_field,
-        &[&state.username, &state.password],
+        &login_state.current_field,
+        &[&login_state.username, &login_state.password],
         theme,
         is_edit_mode,
     );
 
     // --- ERROR MESSAGE ---
-    if let Some(err) = &state.error_message {
+    if let Some(err) = &login_state.error_message {
         f.render_widget(
             Paragraph::new(err.as_str())
                 .style(Style::default().fg(Color::Red))
@@ -77,7 +77,7 @@ pub fn render_login(
     // Login Button
     let login_button_index = 0;
     let login_active = if app_state.ui.focus_outside_canvas {
-        app_state.general.selected_item == login_button_index
+        app_state.focused_button_index== login_button_index
     } else {
         false
     };    
@@ -104,7 +104,7 @@ pub fn render_login(
     // Return Button
     let return_button_index = 1; // Assuming Return is the second general element
     let return_active = if app_state.ui.focus_outside_canvas {
-        app_state.general.selected_item == return_button_index
+        app_state.focused_button_index== return_button_index
     } else {
         false // Not active if focus is in canvas or other modes
     };    

client/src/components/auth/register.rs

@@ -4,14 +4,14 @@ use crate::{
     config::colors::themes::Theme,
     state::pages::auth::RegisterState, // Use RegisterState
     components::common::{dialog, autocomplete},    
-    state::state::AppState,
-    state::canvas_state::CanvasState,
+    state::app::state::AppState,
+    state::pages::canvas_state::CanvasState,
     modes::handlers::mode_manager::AppMode,
 };
 use ratatui::{
     layout::{Alignment, Constraint, Direction, Layout, Rect, Margin},
     style::{Style, Modifier, Color},
-    widgets::{Block, BorderType, Borders, Paragraph, Wrap},
+    widgets::{Block, BorderType, Borders, Paragraph},
     Frame,
 };
 
@@ -92,7 +92,7 @@ pub fn render_register(
     // Register Button
     let register_button_index = 0;
     let register_active = if app_state.ui.focus_outside_canvas {
-        app_state.general.selected_item == register_button_index
+        app_state.focused_button_index== register_button_index
     } else {
         false
     };
@@ -119,7 +119,7 @@ pub fn render_register(
     // Return Button (logic remains similar)
     let return_button_index = 1;
     let return_active = if app_state.ui.focus_outside_canvas {
-        app_state.general.selected_item == return_button_index
+        app_state.focused_button_index== return_button_index
     } else {
         false
     };

client/src/components/form/form.rs

@@ -6,7 +6,7 @@ use ratatui::{
     Frame,
 };
 use crate::config::colors::themes::Theme;
-use crate::state::canvas_state::CanvasState;
+use crate::state::pages::canvas_state::CanvasState;
 use crate::components::handlers::canvas::render_canvas;
 
 pub fn render_form(

client/src/components/handlers.rs

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

client/src/components/handlers/buffer_list.rs

@@ -0,0 +1,61 @@
+// src/components/handlers/buffer_list.rs
+
+use crate::config::colors::themes::Theme;
+use crate::state::app::state::AppState;
+use ratatui::{
+    layout::{Alignment, Rect}, // Added Alignment
+    style::{Style, Stylize},
+    text::{Line, Span}, // Added Span
+    widgets::{Block, Borders, Paragraph}, // Changed widgets
+    Frame,
+};
+
+pub fn render_buffer_list(
+    f: &mut Frame,
+    area: Rect,
+    theme: &Theme,
+    app_state: &AppState,
+) {
+    let mut current_buffer_name = "*scratch*"; // Default
+
+    // Determine the active buffer name based on UI state
+    if app_state.ui.show_intro {
+        current_buffer_name = "Intro";
+    } else if app_state.ui.show_register {
+        current_buffer_name = "Register";
+    } else if app_state.ui.show_login {
+        current_buffer_name = "Login";
+    } else if app_state.ui.show_admin {
+        current_buffer_name = "Admin Panel";
+    } else if app_state.ui.show_form {
+        // Potentially make this more specific later (e.g., show table name)
+        current_buffer_name = "Data Form";
+    }
+    // Add more conditions if other views exist
+
+    // Create the text line for the buffer name with padding
+    let buffer_text = Line::from(vec![
+        Span::raw(" "), // Left padding
+        Span::styled(
+            current_buffer_name,
+            Style::default().fg(theme.bg).bg(theme.highlight), // Style active tab
+        ),
+        Span::raw(" "), // Right padding
+    ]);
+
+    // Create the paragraph centered within the block
+    let paragraph = Paragraph::new(buffer_text)
+        .alignment(Alignment::Left) // Align text left, padding handles spacing
+        .block(
+            Block::default()
+                // Keep only the bottom border to act as a separator
+                .borders(Borders::BOTTOM)
+                .border_style(Style::default().fg(theme.secondary)),
+        )
+        // Set the background for the entire area (behind the text/block)
+        .style(Style::default().bg(theme.bg));
+
+    // Render the paragraph widget
+    f.render_widget(paragraph, area);
+}
+

client/src/components/handlers/canvas.rs

@@ -8,9 +8,7 @@ use ratatui::{
     prelude::Alignment,
 };
 use crate::config::colors::themes::Theme;
-use crate::state::canvas_state::CanvasState;
-use crate::components::common::autocomplete;
-use crate::components::render_autocomplete_dropdown;
+use crate::state::pages::canvas_state::CanvasState;
 
 pub fn render_canvas(
     f: &mut Frame,

client/src/components/intro/intro.rs

@@ -8,103 +8,80 @@ use ratatui::{
     Frame,
 };
 use crate::config::colors::themes::Theme;
+use crate::state::pages::intro::IntroState;
 
-pub struct IntroState {
-    pub selected_option: usize,
+pub fn render_intro(f: &mut Frame, intro_state: &IntroState, area: Rect, theme: &Theme) {
+    let block = Block::default()
+        .borders(Borders::ALL)
+        .border_type(BorderType::Rounded)
+        .border_style(Style::default().fg(theme.accent))
+        .style(Style::default().bg(theme.bg));
+
+    let inner_area = block.inner(area);
+    f.render_widget(block, area);
+
+    // Center layout
+    let chunks = Layout::default()
+        .direction(Direction::Vertical)
+        .constraints([
+            Constraint::Percentage(40),
+            Constraint::Length(5),
+            Constraint::Percentage(40),
+        ])
+        .split(inner_area);
+
+    // Title
+    let title = Line::from(vec![
+        Span::styled("multieko2", Style::default().fg(theme.highlight)),
+        Span::styled(" v", Style::default().fg(theme.fg)),
+        Span::styled(env!("CARGO_PKG_VERSION"), Style::default().fg(theme.secondary)),
+    ]);
+    let title_para = Paragraph::new(title)
+        .alignment(Alignment::Center);
+    f.render_widget(title_para, chunks[1]);
+
+    // Buttons - now with 4 options
+    let button_area = Layout::default()
+        .direction(Direction::Horizontal)
+        .constraints([
+            Constraint::Percentage(25),
+            Constraint::Percentage(25),
+            Constraint::Percentage(25),
+            Constraint::Percentage(25),
+        ])
+        .split(chunks[1].inner(Margin {
+            horizontal: 1,
+            vertical: 1
+        }));
+
+    let buttons = ["Continue", "Admin", "Login", "Register"];
+    for (i, &text) in buttons.iter().enumerate() {
+        render_button(f, button_area[i], text, intro_state.selected_option == i, theme);
+    }
 }
 
-impl IntroState {
-    pub fn new() -> Self {
-        Self { selected_option: 0 }
-    }
+fn render_button(f: &mut Frame, area: Rect, text: &str, selected: bool, theme: &Theme) {
+    let button_style = Style::default()
+        .fg(if selected { theme.highlight } else { theme.fg })
+        .bg(theme.bg)
+        .add_modifier(if selected {
+            ratatui::style::Modifier::BOLD
+        } else {
+            ratatui::style::Modifier::empty()
+        });
 
-    pub fn render(&self, f: &mut Frame, area: Rect, theme: &Theme) {
-        let block = Block::default()
+    let border_style = Style::default()
+        .fg(if selected { theme.accent } else { theme.border });
+
+    let button = Paragraph::new(text)
+        .style(button_style)
+        .alignment(Alignment::Center)
+        .block(
+            Block::default()
             .borders(Borders::ALL)
-            .border_type(BorderType::Rounded)
-            .border_style(Style::default().fg(theme.accent))
-            .style(Style::default().bg(theme.bg));
+            .border_type(BorderType::Double)
+            .border_style(border_style),
+        );
 
-        let inner_area = block.inner(area);
-        f.render_widget(block, area);
-
-        // Center layout
-        let chunks = Layout::default()
-            .direction(Direction::Vertical)
-            .constraints([
-                Constraint::Percentage(40),
-                Constraint::Length(5),
-                Constraint::Percentage(40),
-            ])
-            .split(inner_area);
-
-        // Title
-        let title = Line::from(vec![
-            Span::styled("multieko2", Style::default().fg(theme.highlight)),
-            Span::styled(" v", Style::default().fg(theme.fg)),
-            Span::styled(env!("CARGO_PKG_VERSION"), Style::default().fg(theme.secondary)),
-        ]);
-        let title_para = Paragraph::new(title)
-            .alignment(Alignment::Center);
-        f.render_widget(title_para, chunks[1]);
-
-        // Buttons - now with 4 options
-        let button_area = Layout::default()
-            .direction(Direction::Horizontal)
-            .constraints([
-                Constraint::Percentage(25),
-                Constraint::Percentage(25),
-                Constraint::Percentage(25),
-                Constraint::Percentage(25),
-            ])
-            .split(chunks[1].inner(Margin {
-                horizontal: 1,
-                vertical: 1
-            }));
-
-        let buttons = ["Continue", "Admin", "Login", "Register"];
-        for (i, &text) in buttons.iter().enumerate() {
-            self.render_button(
-                f,
-                button_area[i],
-                text,
-                self.selected_option == i,
-                theme,
-            );
-        }
-    }
-
-    fn render_button(&self, f: &mut Frame, area: Rect, text: &str, selected: bool, theme: &Theme) {
-        let button_style = Style::default()
-            .fg(if selected { theme.highlight } else { theme.fg })
-            .bg(theme.bg)
-            .add_modifier(if selected {
-                ratatui::style::Modifier::BOLD
-            } else {
-                ratatui::style::Modifier::empty()
-            });
-
-        let border_style = Style::default()
-            .fg(if selected { theme.accent } else { theme.border });
-
-        let button = Paragraph::new(text)
-            .style(button_style)
-            .alignment(Alignment::Center)
-            .block(
-                Block::default()
-                    .borders(Borders::ALL)
-                    .border_type(BorderType::Double)
-                    .border_style(border_style),
-            );
-
-        f.render_widget(button, area);
-    }
-
-    pub fn next_option(&mut self) {
-        self.selected_option = (self.selected_option + 1) % 4;
-    }
-
-    pub fn previous_option(&mut self) {
-        self.selected_option = if self.selected_option == 0 { 3 } else { self.selected_option - 1 };
-    }
+    f.render_widget(button, area);
 }

client/src/functions/modes.rs

@@ -2,7 +2,7 @@
 
 pub mod read_only;
 pub mod edit;
-
+pub mod navigation;
 
 pub use read_only::*;
 pub use edit::*;

client/src/functions/modes/edit/auth_e.rs

@@ -1,7 +1,7 @@
 // src/functions/modes/edit/auth_e.rs
 
 use crate::services::grpc_client::GrpcClient;
-use crate::state::canvas_state::CanvasState;
+use crate::state::pages::canvas_state::CanvasState;
 use crate::state::pages::form::FormState;
 use crate::state::pages::auth::RegisterState;
 use crate::tui::functions::common::form::{revert, save};
@@ -300,9 +300,9 @@ pub async fn execute_edit_action<S: CanvasState + Any + Send>(
 
         // --- Autocomplete Actions ---
         "suggestion_down" | "suggestion_up" | "select_suggestion" | "exit_suggestion_mode" => {
-            // Attempt to downcast to RegisterState
+            // Attempt to downcast to RegisterState to handle suggestion logic here
             if let Some(register_state) = (state as &mut dyn Any).downcast_mut::<RegisterState>() {
-                // Only handle if it's the role field (index 4) and suggestions are shown (except for hide)
+                // Only handle if it's the role field (index 4)
                 if register_state.current_field() == 4 {
                     match action {
                         "suggestion_down" if register_state.in_suggestion_mode => {
@@ -319,34 +319,37 @@ pub async fn execute_edit_action<S: CanvasState + Any + Send>(
                         }
                         "select_suggestion" if register_state.in_suggestion_mode => {
                             if let Some(index) = register_state.selected_suggestion_index {
-                                let selected_role = register_state.role_suggestions[index].clone();
-                                register_state.role = selected_role.clone(); // Update the role field
-                                register_state.in_suggestion_mode = false; // Exit suggestion mode
-                                register_state.show_role_suggestions = false; // Hide suggestions
-                                register_state.selected_suggestion_index = None; // Clear selection
-                                Ok(format!("Selected role: {}", selected_role)) // Return success message
+                                if let Some(selected_role) = register_state.role_suggestions.get(index).cloned() {
+                                    register_state.role = selected_role.clone(); // Update the role field
+                                    register_state.in_suggestion_mode = false; // Exit suggestion mode
+                                    register_state.show_role_suggestions = false; // Hide suggestions
+                                    register_state.selected_suggestion_index = None; // Clear selection
+                                    Ok(format!("Selected role: {}", selected_role)) // Return success message
+                                } else {
+                                    Ok("Selected suggestion index out of bounds.".to_string()) // Error case
+                                }
                             } else {
                                 Ok("No suggestion selected".to_string())
-                                                                                
                             }
                         }
-                        "exit_suggestion_mode" => { // Handle Esc
+                        "exit_suggestion_mode" => { // Handle Esc or other conditions
                             register_state.show_role_suggestions = false;
                             register_state.selected_suggestion_index = None;
                             register_state.in_suggestion_mode = false;
                             Ok("Suggestions hidden".to_string())
                         }
-                        "suggestion_down" | "suggestion_up" | "select_suggestion" => {
-                             Ok("Suggestion action ignored: Not in suggestion mode.".to_string())
+                        _ => {
+                            // Action is suggestion-related but state doesn't match (e.g., not in suggestion mode)
+                            Ok("Suggestion action ignored: State mismatch.".to_string())
                         }
-                        _ => Ok("".to_string())
                     }
                 } else {
-                    Ok("".to_string())
-                }
+                    // It's RegisterState, but not the role field
+                    Ok("Suggestion action ignored: Not on role field.".to_string())
+                 }
             } else {
                 // Downcast failed - this action is only for RegisterState
-                Ok(format!("Action '{}' not applicable for this form type.", action))
+                Ok(format!("Action '{}' not applicable for this state type.", action))
             }
         }
         // --- End Autocomplete Actions ---

client/src/functions/modes/edit/form_e.rs

@@ -1,7 +1,7 @@
 // src/functions/modes/edit/form_e.rs
 
 use crate::services::grpc_client::GrpcClient;
-use crate::state::canvas_state::CanvasState;
+use crate::state::pages::canvas_state::CanvasState;
 use crate::state::pages::form::FormState;
 use crate::tui::functions::common::form::{revert, save};
 use crate::tui::functions::common::form::SaveOutcome;

client/src/functions/modes/navigation.rs

@@ -0,0 +1,3 @@
+// src/functions/modes/navigation.rs
+
+// pub mod admin_nav;

client/src/functions/modes/navigation/admin_nav.rs

@@ -0,0 +1 @@
+// src/functions/modes/navigation/admin_nav.rs

client/src/functions/modes/read_only/auth_ro.rs

@@ -1,8 +1,8 @@
 // src/functions/modes/read_only/auth_ro.rs
 
 use crate::config::binds::key_sequences::KeySequenceTracker;
-use crate::state::canvas_state::CanvasState;
-use crate::state::state::AppState;
+use crate::state::pages::canvas_state::CanvasState;
+use crate::state::app::state::AppState;
 use std::error::Error;
 
 #[derive(PartialEq)]
@@ -60,7 +60,7 @@ pub async fn execute_action<S: CanvasState>(
             if current_field == last_field_index {
                 // Already on the last field, move focus outside
                 app_state.ui.focus_outside_canvas = true;
-                app_state.general.selected_item = 0; // Focus first general item (e.g., Login button)
+                app_state.focused_button_index= 0;
                 key_sequence_tracker.reset();
                 Ok("Focus moved below canvas".to_string())
             } else {

client/src/functions/modes/read_only/form_ro.rs

@@ -1,7 +1,7 @@
 // src/functions/modes/read_only/form_ro.rs
 
 use crate::config::binds::key_sequences::KeySequenceTracker;
-use crate::state::canvas_state::CanvasState;
+use crate::state::pages::canvas_state::CanvasState;
 use std::error::Error;
 
 #[derive(PartialEq)]

client/src/modes/canvas/common_mode.rs

@@ -1,8 +1,8 @@
 // src/modes/canvas/common_mode.rs
 
 use crate::tui::terminal::core::TerminalCore;
-use crate::state::pages::{form::FormState, auth::AuthState, auth::RegisterState};
-use crate::state::state::AppState;
+use crate::state::pages::{form::FormState, auth::LoginState, auth::RegisterState, auth::AuthState};
+use crate::state::app::state::AppState;
 use crate::services::grpc_client::GrpcClient;
 use crate::services::auth::AuthClient;
 use crate::modes::handlers::event::EventOutcome;
@@ -17,6 +17,7 @@ pub async fn handle_core_action(
     action: &str,
     form_state: &mut FormState,
     auth_state: &mut AuthState,
+    login_state: &mut LoginState,
     register_state: &mut RegisterState,
     grpc_client: &mut GrpcClient,
     auth_client: &mut AuthClient,
@@ -28,7 +29,7 @@ pub async fn handle_core_action(
     match action {
         "save" => {
             if app_state.ui.show_login {
-                let message = login_save(auth_state, auth_client, app_state).await?;
+                let message = login_save(auth_state, login_state, auth_client, app_state).await?;
                 Ok(EventOutcome::Ok(message))
             } else if app_state.ui.show_register {
                 let message = register_save(register_state, auth_client, app_state).await?;
@@ -54,7 +55,7 @@ pub async fn handle_core_action(
         },
         "save_and_quit" => {
             let message = if app_state.ui.show_login {
-                login_save(auth_state, auth_client, app_state).await?
+                login_save(auth_state, login_state, auth_client, app_state).await?
             } else if app_state.ui.show_register {
                 register_save(register_state, auth_client, app_state).await?
             } else {
@@ -75,7 +76,7 @@ pub async fn handle_core_action(
         },
         "revert" => {
             if app_state.ui.show_login {
-                let message = login_revert(auth_state, app_state).await;
+                let message = login_revert(login_state, app_state).await;
                 Ok(EventOutcome::Ok(message))
             } else if app_state.ui.show_register {
                 let message = register_revert(register_state, app_state).await;

client/src/modes/canvas/edit.rs

@@ -2,19 +2,19 @@
 
 use crate::config::binds::config::Config;
 use crate::services::grpc_client::GrpcClient;
-use crate::state::pages::{auth::{AuthState, RegisterState}};
-use crate::state::canvas_state::CanvasState;
+use crate::state::pages::{auth::{LoginState, RegisterState}};
+use crate::state::pages::canvas_state::CanvasState;
 use crate::state::pages::form::FormState;
 use crate::functions::modes::edit::{auth_e, form_e};
 use crate::modes::handlers::event::EventOutcome;
-use crate::state::state::AppState;
+use crate::state::app::state::AppState;
 use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
 
 pub async fn handle_edit_event(
     key: KeyEvent,
     config: &Config,
     form_state: &mut FormState,
-    auth_state: &mut AuthState,
+    login_state: &mut LoginState,
     register_state: &mut RegisterState,
     ideal_cursor_column: &mut usize,
     command_message: &mut String,
@@ -44,7 +44,7 @@ pub async fn handle_edit_event(
             let message = if app_state.ui.show_login {
                 auth_e::execute_common_action(
                     action,
-                    auth_state,  // Concrete AuthState
+                    login_state,
                     grpc_client,
                     current_position,
                     total_count
@@ -99,7 +99,7 @@ pub async fn handle_edit_event(
             auth_e::execute_edit_action(
                 action,
                 key,
-                auth_state,
+                login_state,
                 ideal_cursor_column,
                 grpc_client,
                 current_position,
@@ -143,7 +143,7 @@ pub async fn handle_edit_event(
             auth_e::execute_edit_action(
                 "insert_char",
                 key,
-                auth_state,
+                login_state,
                 ideal_cursor_column,
                 grpc_client,
                 current_position,

client/src/modes/canvas/read_only.rs

@@ -3,10 +3,10 @@
 use crate::config::binds::config::Config;
 use crate::config::binds::key_sequences::KeySequenceTracker;
 use crate::services::grpc_client::GrpcClient;
-use crate::state::{canvas_state::CanvasState, pages::auth::RegisterState};
-use crate::state::pages::auth::AuthState;
+use crate::state::pages::{canvas_state::CanvasState, auth::RegisterState};
+use crate::state::pages::auth::LoginState;
 use crate::state::pages::form::FormState;
-use crate::state::state::AppState;
+use crate::state::app::state::AppState;
 use crate::functions::modes::read_only::{auth_ro, form_ro};
 use crossterm::event::KeyEvent;
 
@@ -15,7 +15,7 @@ pub async fn handle_read_only_event(
     key: KeyEvent,
     config: &Config,
     form_state: &mut FormState,
-    auth_state: &mut AuthState,
+    login_state: &mut LoginState,
     register_state: &mut RegisterState,
     key_sequence_tracker: &mut KeySequenceTracker,
     current_position: &mut u64,
@@ -34,8 +34,8 @@ pub async fn handle_read_only_event(
     if config.is_enter_edit_mode_after(key.code, key.modifiers) {
         let (current_input, current_pos) = if app_state.ui.show_login { // Check Login first
             (
-                auth_state.get_current_input(),
-                auth_state.current_cursor_pos(),
+                login_state.get_current_input(),
+                login_state.current_cursor_pos(),
             )
         } else if app_state.ui.show_register { // Then check Register
             (
@@ -51,8 +51,8 @@ pub async fn handle_read_only_event(
 
         if !current_input.is_empty() && current_pos < current_input.len() {
             if app_state.ui.show_login {
-                auth_state.set_current_cursor_pos(current_pos + 1);
-                *ideal_cursor_column = auth_state.current_cursor_pos();
+                login_state.set_current_cursor_pos(current_pos + 1);
+                *ideal_cursor_column = login_state.current_cursor_pos();
             } else if app_state.ui.show_register {
                 register_state.set_current_cursor_pos(current_pos + 1);
                 *ideal_cursor_column = register_state.current_cursor_pos();
@@ -95,12 +95,7 @@ pub async fn handle_read_only_event(
                 )
                 .await?
             } else if app_state.ui.show_login && CONTEXT_ACTIONS_LOGIN.contains(&action) { // Handle login context actions
-                crate::tui::functions::login::handle_action(
-                    action,
-                    auth_state,
-                    ideal_cursor_column,
-                )
-                .await?
+                crate::tui::functions::login::handle_action(action).await?
             } else if app_state.ui.show_register{
                 auth_ro::execute_action(
                     action,
@@ -114,7 +109,7 @@ pub async fn handle_read_only_event(
                 auth_ro::execute_action(
                     action,
                     app_state,
-                    auth_state,
+                    login_state,
                     ideal_cursor_column,
                     key_sequence_tracker,
                     command_message,
@@ -151,12 +146,7 @@ pub async fn handle_read_only_event(
                     )
                     .await?
                 } else if app_state.ui.show_login && CONTEXT_ACTIONS_LOGIN.contains(&action) { // Handle login context actions
-                    crate::tui::functions::login::handle_action(
-                        action,
-                        auth_state,
-                        ideal_cursor_column,
-                    )
-                    .await?
+                    crate::tui::functions::login::handle_action(action).await?
                 } else if app_state.ui.show_register /* && CONTEXT_ACTIONS_REGISTER.contains(&action) */ { // Handle register general actions
                     auth_ro::execute_action(
                         action,
@@ -170,7 +160,7 @@ pub async fn handle_read_only_event(
                     auth_ro::execute_action(
                         action,
                         app_state,
-                        auth_state,
+                        login_state,
                         ideal_cursor_column,
                         key_sequence_tracker,
                         command_message,
@@ -206,12 +196,7 @@ pub async fn handle_read_only_event(
                 )
                 .await?
             } else if app_state.ui.show_login && CONTEXT_ACTIONS_LOGIN.contains(&action) { // Handle login context actions
-                crate::tui::functions::login::handle_action(
-                    action,
-                    auth_state,
-                    ideal_cursor_column,
-                )
-                .await?
+                crate::tui::functions::login::handle_action(action).await?
             } else if app_state.ui.show_register /* && CONTEXT_ACTIONS_REGISTER.contains(&action) */ { // Handle register general actions
                 auth_ro::execute_action(
                     action,
@@ -225,7 +210,7 @@ pub async fn handle_read_only_event(
                 auth_ro::execute_action(
                     action,
                     app_state,
-                    auth_state,
+                    login_state,
                     ideal_cursor_column,
                     key_sequence_tracker,
                     command_message,

client/src/modes/common/command_mode.rs

@@ -4,7 +4,7 @@ use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
 use crate::config::binds::config::Config;
 use crate::services::grpc_client::GrpcClient;
 use crate::state::pages::form::FormState;
-use crate::state::{state::AppState, pages::auth::AuthState};
+use crate::state::{app::state::AppState, pages::auth::LoginState, pages::auth::RegisterState};
 use crate::modes::common::commands::CommandHandler;
 use crate::tui::terminal::core::TerminalCore;
 use crate::tui::functions::common::form::{save, revert};
@@ -16,7 +16,8 @@ pub async fn handle_command_event(
     key: KeyEvent,
     config: &Config,
     app_state: &AppState,
-    auth_state: &AuthState,
+    login_state: &LoginState,
+    register_state: &RegisterState,
     form_state: &mut FormState,
     command_input: &mut String,
     command_message: &mut String,
@@ -39,7 +40,8 @@ pub async fn handle_command_event(
             config,
             form_state,
             app_state,
-            auth_state,
+            login_state,
+            register_state,
             command_input,
             command_message,
             grpc_client,
@@ -73,7 +75,8 @@ async fn process_command(
     config: &Config,
     form_state: &mut FormState,
     app_state: &AppState,
-    auth_state: &AuthState,
+    login_state: &LoginState,
+    register_state: &RegisterState,
     command_input: &mut String,
     command_message: &mut String,
     grpc_client: &mut GrpcClient,
@@ -101,7 +104,8 @@ async fn process_command(
                     terminal,
                     app_state,
                     form_state,
-                    auth_state,
+                    login_state,
+                    register_state,
                 )
                 .await?;
             command_input.clear();

client/src/modes/common/commands.rs

@@ -1,8 +1,8 @@
 // src/modes/common/commands.rs
 use crate::tui::terminal::core::TerminalCore;
-use crate::state::state::AppState;
-use crate::state::pages::{form::FormState, auth::AuthState};
-use crate::state::canvas_state::CanvasState;
+use crate::state::app::state::AppState;
+use crate::state::pages::{form::FormState, auth::LoginState, auth::RegisterState};
+use crate::state::pages::canvas_state::CanvasState;
 
 pub struct CommandHandler;
 
@@ -17,10 +17,11 @@ impl CommandHandler {
         terminal: &mut TerminalCore,
         app_state: &AppState,
         form_state: &FormState,
-        auth_state: &AuthState,
+        login_state: &LoginState,
+        register_state: &RegisterState,
     ) -> Result<(bool, String), Box<dyn std::error::Error>> {
         match action {
-            "quit" => self.handle_quit(terminal, app_state, form_state, auth_state).await,
+            "quit" => self.handle_quit(terminal, app_state, form_state, login_state, register_state).await,
             "force_quit" => self.handle_force_quit(terminal).await,
             "save_and_quit" => self.handle_save_quit(terminal).await,
             _ => Ok((false, format!("Unknown command: {}", action))),
@@ -32,11 +33,14 @@ impl CommandHandler {
         terminal: &mut TerminalCore,
         app_state: &AppState,
         form_state: &FormState,
-        auth_state: &AuthState,
+        login_state: &LoginState,
+        register_state: &RegisterState,
     ) -> Result<(bool, String), Box<dyn std::error::Error>> {
         // Use actual unsaved changes state instead of is_saved flag
         let has_unsaved = if app_state.ui.show_login {
-            auth_state.has_unsaved_changes()
+            login_state.has_unsaved_changes()
+        } else if app_state.ui.show_register {
+            register_state.has_unsaved_changes()
         } else {
             form_state.has_unsaved_changes
         };

client/src/modes/general/dialog.rs

@@ -3,10 +3,10 @@
 use crossterm::event::{Event, KeyCode};
 use crate::config::binds::config::Config;
 use crate::ui::handlers::context::DialogPurpose;
-use crate::state::state::AppState;
+use crate::state::app::state::AppState;
 use crate::state::pages::auth::AuthState;
+use crate::state::pages::auth::LoginState;
 use crate::state::pages::auth::RegisterState;
-use crate::services::auth::AuthClient;
 use crate::modes::handlers::event::EventOutcome;
 use crate::tui::functions::common::{login, register};
 
@@ -18,8 +18,8 @@ pub async fn handle_dialog_event(
     config: &Config,
     app_state: &mut AppState,
     auth_state: &mut AuthState,
+    login_state: &mut LoginState,
     register_state: &mut RegisterState,
-    auth_client: &mut AuthClient,
 ) -> Option<Result<EventOutcome, Box<dyn std::error::Error>>> {
     if let Event::Key(key) = event {
         // Always allow Esc to dismiss
@@ -62,7 +62,7 @@ pub async fn handle_dialog_event(
                             match selected_index {
                                 0 => { // "Menu" button selected
                                     app_state.hide_dialog();
-                                    let message = login::back_to_main(auth_state, app_state).await;
+                                    let message = login::back_to_main(login_state, app_state).await;
                                     return Some(Ok(EventOutcome::Ok(message)));
                                 }
                                 1 => {

client/src/modes/general/navigation.rs

@@ -2,10 +2,13 @@
 
 use crossterm::event::KeyEvent;
 use crate::config::binds::config::Config;
-use crate::state::state::AppState;
+use crate::state::app::state::AppState;
 use crate::state::pages::form::FormState;
-use crate::state::pages::auth::AuthState;
-use crate::state::canvas_state::CanvasState;
+use crate::state::pages::auth::LoginState;
+use crate::state::pages::auth::RegisterState;
+use crate::state::pages::intro::IntroState;
+use crate::state::pages::admin::AdminState;
+use crate::state::pages::canvas_state::CanvasState;
 use crate::ui::handlers::context::UiContext;
 use crate::modes::handlers::event::EventOutcome;
 
@@ -14,7 +17,10 @@ pub async fn handle_navigation_event(
     config: &Config,
     form_state: &mut FormState,
     app_state: &mut AppState,
-    auth_state: &mut AuthState,
+    login_state: &mut LoginState,
+    register_state: &mut RegisterState,
+    intro_state: &mut IntroState,
+    admin_state: &mut AdminState,
     command_mode: &mut bool,
     command_input: &mut String,
     command_message: &mut String,
@@ -22,27 +28,21 @@ pub async fn handle_navigation_event(
     if let Some(action) = config.get_general_action(key.code, key.modifiers) {
         match action {
             "move_up" => {
-                move_up(app_state, auth_state);
+                move_up(app_state, login_state, register_state, intro_state, admin_state);
                 return Ok(EventOutcome::Ok(String::new()));
             }
             "move_down" => {
-                move_down(app_state);
+                move_down(app_state, intro_state, admin_state);
                 return Ok(EventOutcome::Ok(String::new()));
             }
             "next_option" => {
-                next_option(app_state);
+                next_option(app_state, intro_state);
                 return Ok(EventOutcome::Ok(String::new()));
             }
             "previous_option" => {
-                previous_option(app_state);
+                previous_option(app_state, intro_state);
                 return Ok(EventOutcome::Ok(String::new()));
             }
-            "toggle_sidebar" => {
-                toggle_sidebar(app_state);
-                return Ok(EventOutcome::Ok(format!("Sidebar {}",
-                    if app_state.ui.show_sidebar { "shown" } else { "hidden" }
-                )));
-            }
             "next_field" => {
                 next_field(form_state);
                 return Ok(EventOutcome::Ok(String::new()));
@@ -57,17 +57,16 @@ pub async fn handle_navigation_event(
             }
             "select" => {
                 let (context, index) = if app_state.ui.show_intro {
-                    (UiContext::Intro, app_state.ui.intro_state.selected_option)
+                    (UiContext::Intro, intro_state.selected_option)
                 } else if app_state.ui.show_login && app_state.ui.focus_outside_canvas {
-                    (UiContext::Login, app_state.general.selected_item)
+                    (UiContext::Login, app_state.focused_button_index)
                 } else if app_state.ui.show_register && app_state.ui.focus_outside_canvas {
-                    (UiContext::Register, app_state.general.selected_item)
+                    (UiContext::Register, app_state.focused_button_index)
                 } else if app_state.ui.show_admin {
-                    (UiContext::Admin, app_state.general.selected_item)
+                    (UiContext::Admin, admin_state.get_selected_index().unwrap_or(0))
                 } else if app_state.ui.dialog.dialog_show {
                      (UiContext::Dialog, app_state.ui.dialog.dialog_active_button_index)
                 } else {
-                    // Handle cases where select is pressed but no button context applies
                     return Ok(EventOutcome::Ok("Select (No Action)".to_string()));
                 };
                 return Ok(EventOutcome::ButtonSelected { context, index });
@@ -78,79 +77,63 @@ pub async fn handle_navigation_event(
     Ok(EventOutcome::Ok(String::new()))
 }
 
-pub fn move_up(app_state: &mut AppState, auth_state: &mut AuthState) {
+pub fn move_up(app_state: &mut AppState, login_state: &mut LoginState, register_state: &mut RegisterState, intro_state: &mut IntroState, admin_state: &mut AdminState) {
     if app_state.ui.focus_outside_canvas && app_state.ui.show_login || app_state.ui.show_register{
-        if app_state.general.selected_item == 0 {
+        if app_state.focused_button_index == 0 {
             app_state.ui.focus_outside_canvas = false;
-            let last_field_index = auth_state.fields().len().saturating_sub(1);
-            auth_state.set_current_field(last_field_index);
+            if app_state.ui.show_login {
+                let last_field_index = login_state.fields().len().saturating_sub(1);
+                login_state.set_current_field(last_field_index);
+            } else {
+                let last_field_index = register_state.fields().len().saturating_sub(1);
+                register_state.set_current_field(last_field_index);
+            }
         } else {
-            app_state.general.selected_item = app_state.general.selected_item.saturating_sub(1);
+            app_state.focused_button_index = app_state.focused_button_index.saturating_sub(1);
         }
     } else if app_state.ui.show_intro {
-        app_state.ui.intro_state.previous_option();
+        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);
-        }
+        admin_state.previous();
     }
 }
 
-pub fn move_down(app_state: &mut AppState) {
+pub fn move_down(app_state: &mut AppState, intro_state: &mut IntroState, admin_state: &mut AdminState) {
     if app_state.ui.focus_outside_canvas && app_state.ui.show_login || app_state.ui.show_register {
         let num_general_elements = 2;
-        if app_state.general.selected_item < num_general_elements - 1 {
-            app_state.general.selected_item += 1;
+        if app_state.focused_button_index < num_general_elements - 1 {
+            app_state.focused_button_index += 1;
         }
     } else if app_state.ui.show_intro {
-        app_state.ui.intro_state.next_option();
+        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;
+        admin_state.next();
     }
 }
 
-pub fn next_option(app_state: &mut AppState) {  // Remove option_count parameter
+pub fn next_option(app_state: &mut AppState, intro_state: &mut IntroState) { 
     if app_state.ui.show_intro {
-        app_state.ui.intro_state.next_option();
+        intro_state.next_option();
     } else {
         // Get option count from state instead of parameter
         let option_count = app_state.profile_tree.profiles.len();
-        app_state.general.current_option = (app_state.general.current_option + 1) % option_count;
+        app_state.focused_button_index = (app_state.focused_button_index + 1) % option_count;
     }
 }
 
-pub fn previous_option(app_state: &mut AppState) {
+pub fn previous_option(app_state: &mut AppState, intro_state: &mut IntroState) {
     if app_state.ui.show_intro {
-        app_state.ui.intro_state.previous_option();
+        intro_state.previous_option();
     } else {
         let option_count = app_state.profile_tree.profiles.len();
-        app_state.general.current_option = if app_state.general.current_option == 0 {
-            option_count.saturating_sub(1)  // Wrap to last option
+        app_state.focused_button_index = if app_state.focused_button_index == 0 {
+            option_count.saturating_sub(1)
         } else {
-            app_state.general.current_option - 1
+            app_state.focused_button_index - 1
         };
     }
 }
 
-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();

client/src/modes/handlers/event.rs

@@ -8,8 +8,12 @@ use crate::modes::common::commands::CommandHandler;
 use crate::config::binds::config::Config;
 use crate::state::pages::form::FormState;
 use crate::state::pages::auth::AuthState;
+use crate::state::pages::auth::LoginState;
 use crate::state::pages::auth::RegisterState;
-use crate::state::canvas_state::CanvasState;
+use crate::state::pages::intro::IntroState;
+use crate::state::pages::admin::AdminState;
+use crate::state::app::state::AppState;
+use crate::state::pages::canvas_state::CanvasState;
 use crate::ui::handlers::rat_state::UiStateHandler;
 use crate::ui::handlers::context::UiContext;
 use crate::tui::functions::{intro, admin};
@@ -65,8 +69,11 @@ impl EventHandler {
         command_handler: &mut CommandHandler,
         form_state: &mut FormState,
         auth_state: &mut AuthState,
+        login_state: &mut LoginState,
         register_state: &mut RegisterState,
-        app_state: &mut crate::state::state::AppState,
+        intro_state: &mut IntroState,
+        admin_state: &mut AdminState,
+        app_state: &mut AppState,
         total_count: u64,
         current_position: &mut u64,
     ) -> Result<EventOutcome, Box<dyn std::error::Error>> {
@@ -76,7 +83,7 @@ impl EventHandler {
         // --- DIALOG MODALITY ---
         if app_state.ui.dialog.dialog_show {
             if let Some(dialog_result) = dialog::handle_dialog_event(
-                &event, config, app_state, auth_state, register_state, &mut self.auth_client
+                &event, config, app_state, auth_state, login_state, register_state
             ).await {
                 return dialog_result;
             }
@@ -94,6 +101,13 @@ impl EventHandler {
                 );
                 return Ok(EventOutcome::Ok(message));
             }
+            if UiStateHandler::toggle_buffer_list(&mut app_state.ui, config, key_code, modifiers) {
+                let message = format!("Buffer {}",
+                    if app_state.ui.show_buffer_list { "shown" } else { "hidden" }
+                );
+                return Ok(EventOutcome::Ok(message));
+            }
+            // --- End Global UI Toggles ---
 
             match current_mode {
                 AppMode::General => {
@@ -102,7 +116,10 @@ impl EventHandler {
                         config,
                         form_state,
                         app_state,
-                        auth_state,
+                        login_state,
+                        register_state,
+                        intro_state,
+                        admin_state,
                         &mut self.command_mode,
                         &mut self.command_input,
                         &mut self.command_message,
@@ -112,13 +129,19 @@ impl EventHandler {
                             let mut message = String::from("Selected"); // Default message
                             match context {
                                 UiContext::Intro => {
-                                    intro::handle_intro_selection(app_state, index); // Pass index
+                                    intro::handle_intro_selection(app_state, index);
+                                    if app_state.ui.show_admin {
+                                        let profile_names = app_state.profile_tree.profiles.iter()
+                                            .map(|p| p.name.clone())
+                                            .collect();
+                                        admin_state.set_profiles(profile_names);
+                                    }
                                     message = format!("Intro Option {} selected", index);
                                 }
                                 UiContext::Login => {
                                     message = match index {
-                                        0 => login::save(auth_state, &mut self.auth_client, app_state).await?,
-                                        1 => login::back_to_main(auth_state, app_state).await,
+                                        0 => login::save(auth_state, login_state, &mut self.auth_client, app_state).await?,
+                                        1 => login::back_to_main(login_state, app_state).await,
                                         _ => "Invalid Login Option".to_string(),
                                     };
                                 }
@@ -130,8 +153,8 @@ impl EventHandler {
                                     };
                                 }
                                 UiContext::Admin => {
-                                    // Assuming handle_admin_selection uses app_state.general.selected_item
-                                    admin::handle_admin_selection(app_state);
+                                    admin::handle_admin_selection(app_state, admin_state);
+
                                     message = format!("Admin Option {} selected", index);
                                 }
                                 UiContext::Dialog => {
@@ -157,20 +180,20 @@ impl EventHandler {
                     if config.is_enter_edit_mode_after(key_code, modifiers) &&
                        ModeManager::can_enter_edit_mode(current_mode) {
                         let current_input = if app_state.ui.show_login || app_state.ui.show_register{
-                            auth_state.get_current_input()
+                            login_state.get_current_input()
                         } else {
                             form_state.get_current_input()
                         };
                         let current_cursor_pos = if app_state.ui.show_login || app_state.ui.show_register{
-                            auth_state.current_cursor_pos()
+                            login_state.current_cursor_pos()
                         } else {
                             form_state.current_cursor_pos()
                         };
 
                         if !current_input.is_empty() && current_cursor_pos < current_input.len() {
                              if app_state.ui.show_login || app_state.ui.show_register{
-                                auth_state.set_current_cursor_pos(current_cursor_pos + 1);
-                                self.ideal_cursor_column = auth_state.current_cursor_pos();
+                                login_state.set_current_cursor_pos(current_cursor_pos + 1);
+                                self.ideal_cursor_column = login_state.current_cursor_pos();
                             } else {
                                 form_state.set_current_cursor_pos(current_cursor_pos + 1);
                                 self.ideal_cursor_column = form_state.current_cursor_pos();
@@ -203,6 +226,7 @@ impl EventHandler {
                                     action,
                                     form_state,
                                     auth_state,
+                                    login_state,
                                     register_state,
                                     grpc_client,
                                     &mut self.auth_client,
@@ -221,7 +245,7 @@ impl EventHandler {
                         key,
                         config,
                         form_state,
-                        auth_state,
+                        login_state,
                         register_state,
                         &mut self.key_sequence_tracker,
                         current_position,
@@ -240,7 +264,7 @@ impl EventHandler {
                         self.edit_mode_cooldown = true;
 
                         let has_changes = if app_state.ui.show_login || app_state.ui.show_register{
-                            auth_state.has_unsaved_changes()
+                            login_state.has_unsaved_changes()
                         } else {
                             form_state.has_unsaved_changes()
                         };
@@ -254,12 +278,12 @@ impl EventHandler {
                         terminal.set_cursor_style(SetCursorStyle::SteadyBlock)?;
 
                         let current_input = if app_state.ui.show_login || app_state.ui.show_register{
-                            auth_state.get_current_input()
+                            login_state.get_current_input()
                         } else {
                             form_state.get_current_input()
                         };
                         let current_cursor_pos = if app_state.ui.show_login || app_state.ui.show_register{
-                            auth_state.current_cursor_pos()
+                            login_state.current_cursor_pos()
                         } else {
                             form_state.current_cursor_pos()
                         };
@@ -267,8 +291,8 @@ impl EventHandler {
                         if !current_input.is_empty() && current_cursor_pos >= current_input.len() {
                             let new_pos = current_input.len() - 1;
                             if app_state.ui.show_login || app_state.ui.show_register{
-                                auth_state.set_current_cursor_pos(new_pos);
-                                self.ideal_cursor_column = auth_state.current_cursor_pos();
+                                login_state.set_current_cursor_pos(new_pos);
+                                self.ideal_cursor_column = login_state.current_cursor_pos();
                             } else {
                                 form_state.set_current_cursor_pos(new_pos);
                                 self.ideal_cursor_column = form_state.current_cursor_pos();
@@ -288,6 +312,7 @@ impl EventHandler {
                                     action,
                                     form_state,
                                     auth_state,
+                                    login_state,
                                     register_state,
                                     grpc_client,
                                     &mut self.auth_client,
@@ -305,7 +330,7 @@ impl EventHandler {
                         key,
                         config,
                         form_state,
-                        auth_state,
+                        login_state,
                         register_state,
                         &mut self.ideal_cursor_column,
                         &mut self.command_message,
@@ -324,7 +349,8 @@ impl EventHandler {
                         key,
                         config,
                         app_state,
-                        auth_state,
+                        login_state,
+                        register_state,
                         form_state,
                         &mut self.command_input,
                         &mut self.command_message,

client/src/modes/handlers/mode_manager.rs

@@ -1,5 +1,5 @@
 // src/modes/handlers/mode_manager.rs
-use crate::state::state::AppState;
+use crate::state::app::state::AppState;
 use crate::modes::handlers::event::EventHandler;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]

client/src/services/ui_service.rs

@@ -3,7 +3,7 @@
 use crate::services::grpc_client::GrpcClient;
 use crate::state::pages::form::FormState;
 use crate::tui::functions::common::form::SaveOutcome;
-use crate::state::state::AppState;
+use crate::state::app::state::AppState;
 
 pub struct UiService;
 

client/src/state/app.rs

@@ -0,0 +1,3 @@
+// src/state/app.rs
+
+pub mod state;

client/src/state/app/state.rs

@@ -2,7 +2,6 @@
 
 use std::env;
 use common::proto::multieko2::table_definition::ProfileTreeResponse;
-use crate::components::IntroState;
 use crate::modes::handlers::mode_manager::AppMode;
 use crate::ui::handlers::context::DialogPurpose;
 
@@ -17,21 +16,16 @@ pub struct DialogState {
 
 pub struct UiState {
     pub show_sidebar: bool,
+    pub show_buffer_list: bool,
     pub show_intro: bool,
     pub show_admin: bool,
     pub show_form: bool,
     pub show_login: bool,
     pub show_register: bool,
-    pub intro_state: IntroState,
     pub focus_outside_canvas: bool,
     pub dialog: DialogState,
 }
 
-pub struct GeneralState {
-    pub selected_item: usize,
-    pub current_option: usize,
-}
-
 pub struct AppState {
     // Core editor state
     pub current_dir: String,
@@ -40,10 +34,10 @@ pub struct AppState {
     pub profile_tree: ProfileTreeResponse,
     pub selected_profile: Option<String>,
     pub current_mode: AppMode,
+    pub focused_button_index: usize,
 
     // UI preferences
     pub ui: UiState,
-    pub general: GeneralState,
 }
 
 impl AppState {
@@ -58,11 +52,8 @@ impl AppState {
             profile_tree: ProfileTreeResponse::default(),
             selected_profile: None,
             current_mode: AppMode::General,
+            focused_button_index: 0,
             ui: UiState::default(),
-            general: GeneralState {
-                selected_item: 0,
-                current_option: 0,
-            },
         })
     }
 
@@ -146,7 +137,7 @@ impl Default for UiState {
             show_form: false,
             show_login: false,
             show_register: false,
-            intro_state: IntroState::new(),
+            show_buffer_list: false,
             focus_outside_canvas: false,
             dialog: DialogState::default(),
         }

client/src/state/mod.rs

@@ -1,4 +1,3 @@
 // src/state/mod.rs
-pub mod state;
+pub mod app;
 pub mod pages;
-pub mod canvas_state;

client/src/state/pages.rs

@@ -2,3 +2,6 @@
 
 pub mod form;
 pub mod auth;
+pub mod admin;
+pub mod intro;
+pub mod canvas_state;

client/src/state/pages/admin.rs

@@ -0,0 +1,65 @@
+// src/state/pages/admin.rs
+
+use ratatui::widgets::ListState;
+
+#[derive(Default, Clone, Debug)]
+pub struct AdminState {
+    pub profiles: Vec<String>,
+    pub list_state: ListState,
+}
+
+impl AdminState {
+    /// Gets the index of the currently selected item.
+    pub fn get_selected_index(&self) -> Option<usize> {
+        self.list_state.selected()
+    }
+
+    /// Gets the name of the currently selected profile.
+    pub fn get_selected_profile_name(&self) -> Option<&String> {
+        self.list_state.selected().and_then(|i| self.profiles.get(i))
+    }
+
+    /// Populates the profile list and updates/resets the selection.
+    pub fn set_profiles(&mut self, new_profiles: Vec<String>) {
+        let current_selection_index = self.list_state.selected();
+        self.profiles = new_profiles;
+
+        if self.profiles.is_empty() {
+            self.list_state.select(None);
+        } else {
+            let new_selection = match current_selection_index {
+                Some(index) => Some(index.min(self.profiles.len() - 1)),
+                None => Some(0),
+            };
+            self.list_state.select(new_selection);
+        }
+    }
+
+    /// Selects the next profile in the list, wrapping around.
+    pub fn next(&mut self) {
+        if self.profiles.is_empty() {
+            self.list_state.select(None);
+            return;
+        }
+        let i = match self.list_state.selected() {
+            Some(i) => if i >= self.profiles.len() - 1 { 0 } else { i + 1 },
+            None => 0,
+        };
+        self.list_state.select(Some(i));
+    }
+
+    /// Selects the previous profile in the list, wrapping around.
+    pub fn previous(&mut self) {
+        if self.profiles.is_empty() {
+            self.list_state.select(None);
+            return;
+        }
+        let i = match self.list_state.selected() {
+            Some(i) => if i == 0 { self.profiles.len() - 1 } else { i - 1 },
+            None => self.profiles.len() - 1,
+        };
+        self.list_state.select(Some(i));
+    }
+
+}
+

client/src/state/pages/auth.rs

@@ -1,5 +1,5 @@
 // src/state/pages/auth.rs
-use crate::state::canvas_state::CanvasState;
+use crate::state::pages::canvas_state::CanvasState;
 use lazy_static::lazy_static;
 
 lazy_static! {
@@ -23,11 +23,11 @@ pub struct AuthState {
 /// Represents the state of the Login form UI
 #[derive(Default)]
 pub struct LoginState {
-    pub username: String,            // Input field for username/email
-    pub password: String,            // Input field for password
-    pub error_message: Option<String>, // Error message specific to login attempt
-    pub current_field: usize,        // 0 for username, 1 for password
-    pub current_cursor_pos: usize,   // Cursor position within current field
+    pub username: String,
+    pub password: String,
+    pub error_message: Option<String>,
+    pub current_field: usize,
+    pub current_cursor_pos: usize,
     pub has_unsaved_changes: bool,
 }
 

client/src/state/pages/form.rs

@@ -2,7 +2,7 @@
 use crate::config::colors::themes::Theme;
 use ratatui::layout::Rect;
 use ratatui::Frame;
-use crate::state::canvas_state::CanvasState;
+use crate::state::pages::canvas_state::CanvasState;
 
 pub struct FormState {
     pub id: i64,

client/src/state/pages/intro.rs

@@ -0,0 +1,25 @@
+// src/state/pages/intro.rs
+
+#[derive(Default, Clone, Debug)]
+pub struct IntroState {
+    pub selected_option: usize,
+}
+
+impl IntroState {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn next_option(&mut self) {
+        if self.selected_option < 3 {
+            self.selected_option += 1;
+        }
+    }
+
+    pub fn previous_option(&mut self) {
+        if self.selected_option > 0 {
+             self.selected_option -= 1
+        }
+    }
+}
+

client/src/tui/functions/admin.rs

@@ -1,8 +1,11 @@
-use crate::state::state::AppState;
+use crate::state::app::state::AppState;
+use crate::state::pages::admin::AdminState;
 
-pub fn handle_admin_selection(app_state: &mut AppState) {
+pub fn handle_admin_selection(app_state: &mut AppState, admin_state: &AdminState) {
     let profiles = &app_state.profile_tree.profiles;
-    if !profiles.is_empty() && app_state.general.selected_item < profiles.len() {
-        app_state.selected_profile = Some(profiles[app_state.general.selected_item].name.clone());
+    if let Some(selected_index) = admin_state.get_selected_index() {
+        if let Some(profile) = profiles.get(selected_index) {
+            app_state.selected_profile = Some(profile.name.clone());
+        }
     }
 }

client/src/tui/functions/common/login.rs

@@ -2,22 +2,24 @@
 
 use crate::services::auth::AuthClient;
 use crate::state::pages::auth::AuthState;
-use crate::state::state::AppState;
-use crate::state::canvas_state::CanvasState;
+use crate::state::pages::auth::LoginState;
+use crate::state::app::state::AppState;
+use crate::state::pages::canvas_state::CanvasState;
 use crate::ui::handlers::context::DialogPurpose;
 
 /// Attempts to log the user in using the provided credentials via gRPC.
 /// Updates AuthState and AppState on success or failure.
 pub async fn save(
     auth_state: &mut AuthState,
+    login_state: &mut LoginState,
     auth_client: &mut AuthClient,
     app_state: &mut AppState,
 ) -> Result<String, Box<dyn std::error::Error>> {
-    let identifier = auth_state.username.clone();
-    let password = auth_state.password.clone();
+    let identifier = login_state.username.clone();
+    let password = login_state.password.clone();
 
     // Clear previous error/dialog state before attempting
-    auth_state.error_message = None;
+    login_state.error_message = None;
     // Use the helper to ensure dialog is hidden and cleared properly
     app_state.hide_dialog();
 
@@ -29,7 +31,7 @@ pub async fn save(
             auth_state.user_id = Some(response.user_id.clone());
             auth_state.role = Some(response.role.clone());
             auth_state.decoded_username = Some(response.username.clone());
-            auth_state.set_has_unsaved_changes(false);
+            login_state.set_has_unsaved_changes(false);
 
             let success_message = format!(
                 "Login Successful!\n\n\
@@ -60,13 +62,8 @@ pub async fn save(
                 vec!["OK".to_string()],
                 DialogPurpose::LoginFailed,
             );
-            // REMOVE these lines:
-            // app_state.ui.dialog.dialog_title = "Login Failed".to_string();
-            // app_state.ui.dialog.dialog_message = error_message.clone();
-            // app_state.ui.dialog.dialog_show = true;
-            // app_state.ui.dialog.dialog_button_active = true;
 
-            auth_state.set_has_unsaved_changes(true);
+            login_state.set_has_unsaved_changes(true);
 
             Ok(format!("Login failed: {}", error_message))
         }
@@ -75,27 +72,27 @@ pub async fn save(
 
 /// Reverts the login form fields to empty and returns to the previous screen (Intro).
 pub async fn revert(
-    auth_state: &mut AuthState,
+    login_state: &mut LoginState,
     app_state: &mut AppState,
 ) -> String {
     // Clear the input fields
-    auth_state.username.clear();
-    auth_state.password.clear();
-    auth_state.error_message = None;
-    auth_state.set_has_unsaved_changes(false);
+    login_state.username.clear();
+    login_state.password.clear();
+    login_state.error_message = None;
+    login_state.set_has_unsaved_changes(false);
 
     "Login reverted".to_string()
 }
 
 pub async fn back_to_main(
-    auth_state: &mut AuthState,
+    login_state: &mut LoginState,
     app_state: &mut AppState,
 ) -> String {
     // Clear the input fields
-    auth_state.username.clear();
-    auth_state.password.clear();
-    auth_state.error_message = None;
-    auth_state.set_has_unsaved_changes(false);
+    login_state.username.clear();
+    login_state.password.clear();
+    login_state.error_message = None;
+    login_state.set_has_unsaved_changes(false);
 
     // Ensure dialog is hidden if revert is called
     app_state.hide_dialog(); // Uncomment if needed
@@ -106,7 +103,7 @@ pub async fn back_to_main(
 
     // Reset focus state
     app_state.ui.focus_outside_canvas = false;
-    app_state.general.selected_item = 0;
+    app_state.focused_button_index= 0;
 
     "Returned to main menu".to_string()
 }

client/src/tui/functions/common/register.rs

@@ -4,8 +4,8 @@ use crate::{
     services::auth::AuthClient,
     state::{
         pages::auth::RegisterState,
-        state::AppState,
-        canvas_state::CanvasState,
+        app::state::AppState,
+        pages::canvas_state::CanvasState,
     },
     ui::handlers::context::DialogPurpose,
 };
@@ -147,7 +147,7 @@ pub async fn back_to_main(
 
     // Reset focus state
     app_state.ui.focus_outside_canvas = false;
-    app_state.general.selected_item = 0; // Reset intro selection
+    app_state.focused_button_index = 0;
 
     "Returned to main menu".to_string()
 }

client/src/tui/functions/form.rs

@@ -1,7 +1,7 @@
 // src/tui/functions/form.rs
 use crate::state::pages::form::FormState;
 use crate::services::grpc_client::GrpcClient;
-use crate::state::canvas_state::CanvasState;
+use crate::state::pages::canvas_state::CanvasState;
 
 pub async fn handle_action(
     action: &str,

client/src/tui/functions/intro.rs

@@ -1,6 +1,7 @@
-use crate::state::state::AppState;
+// src/tui/functions/intro.rs
+use crate::state::app::state::AppState;
 
-pub fn handle_intro_selection(app_state: &mut AppState, index: usize) { // Add index parameter
+pub fn handle_intro_selection(app_state: &mut AppState, index: usize) {
     match index { // Use index directly
         0 => { // Continue
             app_state.ui.show_form = true;
@@ -21,7 +22,7 @@ pub fn handle_intro_selection(app_state: &mut AppState, index: usize) { // Add i
             app_state.ui.show_intro = false;
             app_state.ui.show_register = true;
             app_state.ui.focus_outside_canvas = false;
-            app_state.general.selected_item = 0;
+            app_state.focused_button_index = 0;
         }
         _ => {}
     }

client/src/tui/functions/login.rs

@@ -1,11 +1,6 @@
 // src/tui/functions/login.rs
-use crate::state::pages::auth::AuthState;
 
-pub async fn handle_action(
-    action: &str,
-    auth_state: &mut AuthState,
-    ideal_cursor_column: &mut usize,
-) -> Result<String, Box<dyn std::error::Error>> {
+pub async fn handle_action(action: &str,) -> Result<String, Box<dyn std::error::Error>> {
     match action {
         "previous_entry" => {
             Ok("Previous entry at tui/functions/login.rs not implemented".into())

client/src/ui/handlers/rat_state.rs

@@ -1,7 +1,7 @@
 // src/ui/handlers/rat_state.rs
 use crossterm::event::{KeyCode, KeyModifiers};
 use crate::config::binds::config::Config;
-use crate::state::state::UiState;
+use crate::state::app::state::UiState;
 
 pub struct UiStateHandler;
 
@@ -21,4 +21,18 @@ impl UiStateHandler {
         false
     }
     
+   pub fn toggle_buffer_list(
+       ui_state: &mut UiState,
+       config: &Config,
+       key: KeyCode,
+       modifiers: KeyModifiers,
+   ) -> bool {
+       if let Some(action) = config.get_common_action(key, modifiers) {
+           if action == "toggle_buffer_list" {
+               ui_state.show_buffer_list = !ui_state.show_buffer_list;
+               return true;
+           }
+       }
+       false
+   }
 }

client/src/ui/handlers/render.rs

@@ -2,11 +2,12 @@
 
 use crate::components::{
     render_background,
+    render_buffer_list,
     render_command_line,
     render_status_line,
+    intro::intro::render_intro,
     handlers::sidebar::{self, calculate_sidebar_layout},
     form::form::render_form,
-    admin::{admin_panel::AdminPanelState},
     auth::{login::render_login, register::render_register},
 };
 use crate::config::colors::themes::Theme;
@@ -14,14 +15,20 @@ use ratatui::layout::{Constraint, Direction, Layout};
 use ratatui::Frame;
 use crate::state::pages::form::FormState;
 use crate::state::pages::auth::AuthState;
+use crate::state::pages::auth::LoginState;
 use crate::state::pages::auth::RegisterState;
-use crate::state::state::AppState;
+use crate::state::pages::intro::IntroState;
+use crate::state::app::state::AppState;
+use crate::state::pages::admin::AdminState;
 
 pub fn render_ui(
     f: &mut Frame,
     form_state: &mut FormState,
     auth_state: &mut AuthState,
+    login_state: &LoginState,
     register_state: &RegisterState,
+    intro_state: &IntroState,
+    admin_state: &mut AdminState,
     theme: &Theme,
     is_edit_mode: bool,
     total_count: u64,
@@ -34,18 +41,46 @@ pub fn render_ui(
 ) {
     render_background(f, f.area(), theme);
 
+    // Adjust layout based on whether buffer list is shown
+    let constraints = if app_state.ui.show_buffer_list {
+        vec![
+            Constraint::Length(2),   // Buffer list
+            Constraint::Min(1),      // Main content
+            Constraint::Length(1),   // Status line
+            Constraint::Length(1),   // Command line
+        ]
+    } else {
+        vec![
+            Constraint::Min(1),      // Main content
+            Constraint::Length(1),   // Status line (no buffer list)
+            Constraint::Length(1),   // Command line
+        ]
+    };
+
     let root = Layout::default()
         .direction(Direction::Vertical)
-        .constraints([
-            Constraint::Min(1),
-            Constraint::Length(1),
-            Constraint::Length(1),
-        ])
+        .constraints(constraints)
         .split(f.area());
 
-    let main_content_area = root[0];
+    let mut buffer_list_area = None;
+    let main_content_area;
+    let status_line_area;
+    let command_line_area;
+
+    // Assign areas based on layout
+    if app_state.ui.show_buffer_list {
+        buffer_list_area = Some(root[0]);
+        main_content_area = root[1];
+        status_line_area = root[2];
+        command_line_area = root[3];
+    } else {
+        main_content_area = root[0];
+        status_line_area = root[1];
+        command_line_area = root[2];
+    }
+
     if app_state.ui.show_intro {
-        app_state.ui.intro_state.render(f, main_content_area, theme);
+        render_intro(f, intro_state, main_content_area, theme);
     } else if app_state.ui.show_register {
         render_register(
             f,
@@ -55,35 +90,20 @@ pub fn render_ui(
             app_state,
             register_state.current_field < 4
         );
-    }else if app_state.ui.show_login {
+    } else if app_state.ui.show_login {
         render_login(
-            f, 
-            main_content_area, 
-            theme, 
-            auth_state,
+            f,
+            main_content_area,
+            theme,
+            login_state,
             app_state,
-            auth_state.current_field < 2
+            login_state.current_field < 2
         );
     } else if app_state.ui.show_admin {
-        // 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(
+        crate::components::admin::admin_panel::render_admin_panel(
             f,
+            auth_state,
+            admin_state,
             main_content_area,
             theme,
             &app_state.profile_tree,
@@ -145,10 +165,14 @@ pub fn render_ui(
             total_count,
             current_position,
         );
-    } else{
-
     }
 
-    render_status_line(f, root[1], current_dir, theme, is_edit_mode);
-    render_command_line(f, root[2], command_input, command_mode, theme, command_message);
+    // Render buffer list if enabled and area is available
+    if let Some(area) = buffer_list_area {
+        if app_state.ui.show_buffer_list {
+            render_buffer_list(f, area, theme, app_state);
+        }
+    }
+    render_status_line(f, status_line_area, current_dir, theme, is_edit_mode);
+    render_command_line(f, command_line_area, command_input, command_mode, theme, command_message);
 }

client/src/ui/handlers/ui.rs

@@ -7,11 +7,14 @@ use crate::modes::handlers::event::{EventHandler, EventOutcome}; // Import Event
 use crate::modes::handlers::mode_manager::{AppMode, ModeManager};
 use crate::services::grpc_client::GrpcClient;
 use crate::services::ui_service::UiService;
-use crate::state::canvas_state::CanvasState;
-use crate::state::pages::auth::AuthState;
+use crate::state::pages::canvas_state::CanvasState;
 use crate::state::pages::form::FormState;
+use crate::state::pages::auth::AuthState;
+use crate::state::pages::auth::LoginState;
 use crate::state::pages::auth::RegisterState;
-use crate::state::state::AppState;
+use crate::state::pages::admin::AdminState;
+use crate::state::pages::intro::IntroState;
+use crate::state::app::state::AppState;
  // Import SaveOutcome
 use crate::tui::terminal::{EventReader, TerminalCore};
 use crate::ui::handlers::render::render_ui;
@@ -19,28 +22,27 @@ use crossterm::cursor::SetCursorStyle;
 
 pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     let config = Config::load()?;
+    let theme = Theme::from_str(&config.colors.theme);
     let mut terminal = TerminalCore::new()?;
     let mut grpc_client = GrpcClient::new().await?;
     let mut command_handler = CommandHandler::new();
-    let theme = Theme::from_str(&config.colors.theme);
-    let mut auth_state = AuthState::default();
-    let mut register_state = RegisterState::default();
 
-    // Initialize app_state first
+    let mut event_handler = EventHandler::new().await?;
+    let event_reader = EventReader::new();
+
+    let mut auth_state = AuthState::default();
+    let mut login_state = LoginState::default();
+    let mut register_state = RegisterState::default();
+    let mut intro_state = IntroState::default();
+    let mut admin_state = AdminState::default();
     let mut app_state = AppState::new()?;
 
     // Initialize app state with profile tree and table structure
     let column_names =
         UiService::initialize_app_state(&mut grpc_client, &mut app_state)
             .await?;
-
-    // Initialize FormState with dynamic fields
     let mut form_state = FormState::new(column_names);
 
-    // Initialize EventHandler (which now contains AuthClient)
-    let mut event_handler = EventHandler::new().await?;
-    let event_reader = EventReader::new();
-
     // Fetch the total count of Adresar entries
     UiService::initialize_adresar_count(&mut grpc_client, &mut app_state)
         .await?;
@@ -55,7 +57,10 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
                 f,
                 &mut form_state,
                 &mut auth_state,
+                &login_state,
                 &register_state,
+                &intro_state,
+                &mut admin_state,
                 &theme,
                 is_edit_mode,
                 app_state.total_count,
@@ -108,14 +113,17 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
             .handle_event(
                 event,
                 &config,
-                &mut terminal, // Pass terminal mutably
+                &mut terminal,
                 &mut grpc_client,
                 &mut command_handler,
                 &mut form_state,
                 &mut auth_state,
+                &mut login_state,
                 &mut register_state,
+                &mut intro_state,
+                &mut admin_state,
                 &mut app_state,
-                total_count, // Pass the count *before* potential save
+                total_count,
                 &mut current_position,
             )
             .await;
@@ -255,14 +263,13 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
             }
         } else if app_state.ui.show_login {
             if !event_handler.is_edit_mode {
-                let current_input = auth_state.get_current_input();
+                let current_input = login_state.get_current_input();
                 let max_cursor_pos = if !current_input.is_empty() {
                     current_input.len() - 1
                 } else {
                     0
                 };
-                auth_state.current_cursor_pos =
-                    event_handler.ideal_cursor_column.min(max_cursor_pos);
+                login_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
             }
         }