going directly into adminstate from appstate for the admin page. DESTROYED

Cargo.lock

@@ -436,6 +436,7 @@ dependencies = [
  "toml",
  "tonic",
  "tracing",
+ "unicode-segmentation",
  "unicode-width 0.2.0",
 ]
 

client/Cargo.toml

@@ -19,4 +19,5 @@ tokio = { version = "1.43.0", features = ["full", "macros"] }
 toml = "0.8.20"
 tonic = "0.12.3"
 tracing = "0.1.41"
+unicode-segmentation = "1.12.0"
 unicode-width = "0.2.0"

client/config.toml

@@ -51,11 +51,11 @@ exit_edit_mode = ["esc","ctrl+e"]
 delete_char_forward = ["delete"]
 delete_char_backward = ["backspace"]
 next_field = ["enter"]
-prev_field = ["backtab"]
+prev_field = ["shift+enter"]
 move_left = ["left"]
 move_right = ["right"]
-suggestion_down = ["shift+tab"]
+suggestion_down = ["ctrl+n", "tab"]
-suggestion_up = ["tab"]
+suggestion_up = ["ctrl+p", "shift+tab"]
 select_suggestion = ["enter"]
 exit_suggestion_mode = ["esc"]
 

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,
+        &login_state.current_field,
-        &[&state.username, &state.password],
+        &[&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))

client/src/components/auth/register.rs

@@ -4,8 +4,9 @@ use crate::{
     config::colors::themes::Theme,
     state::pages::auth::RegisterState, // Use RegisterState
     components::common::{dialog, autocomplete},    
-    state::state::AppState,
+    state::app::state::AppState,
-    state::canvas_state::CanvasState,
+    state::pages::canvas_state::CanvasState,
+    modes::handlers::mode_manager::AppMode,
 };
 use ratatui::{
     layout::{Alignment, Constraint, Direction, Layout, Rect, Margin},
@@ -41,6 +42,7 @@ pub fn render_register(
         .direction(Direction::Vertical)
         .constraints([
             Constraint::Length(7), // Form (5 fields + padding)
+            Constraint::Length(1), // Help text line
             Constraint::Length(1), // Error message
             Constraint::Length(3), // Buttons
         ])
@@ -53,25 +55,31 @@ pub fn render_register(
         state,     // The state object (RegisterState)
         &[         // Field labels
             "Username",
-            "Email (Optional)",
+            "Email*",
-            "Password (Optional)",
+            "Password*",
             "Confirm Password",
-            "Role (Optional)",
+            "Role* (Tab)",
         ],
         &state.current_field(), // Pass current field index
         &state.inputs().iter().map(|s| *s).collect::<Vec<&String>>(), // Pass inputs directly
         theme,
         is_edit_mode,
-        // No need to pass suggestion state here, render_canvas uses the trait
     );
 
+    // --- HELP TEXT ---
+    let help_text = Paragraph::new("* are optional fields")
+        .style(Style::default().fg(theme.fg))
+        .alignment(Alignment::Center);
+    f.render_widget(help_text, chunks[1]);
+
+   
     // --- ERROR MESSAGE ---
     if let Some(err) = &state.error_message {
         f.render_widget(
             Paragraph::new(err.as_str())
                 .style(Style::default().fg(Color::Red))
                 .alignment(Alignment::Center),
-            chunks[1],
+            chunks[2],
         );
     }
 
@@ -79,7 +87,7 @@ pub fn render_register(
     let button_chunks = Layout::default()
         .direction(Direction::Horizontal)
         .constraints([Constraint::Percentage(50), Constraint::Percentage(50)])
-        .split(chunks[2]);
+        .split(chunks[3]);
 
     // Register Button
     let register_button_index = 0;
@@ -136,11 +144,13 @@ pub fn render_register(
     );
 
     // --- Render Autocomplete Dropdown (Draw AFTER buttons) ---
-    if let Some(suggestions) = state.get_suggestions() {
+    if app_state.current_mode == AppMode::Edit {
-        let selected = state.get_selected_suggestion_index();
+        if let Some(suggestions) = state.get_suggestions() {
-        if !suggestions.is_empty() {
+            let selected = state.get_selected_suggestion_index();
-            if let Some(input_rect) = active_field_rect {
+            if !suggestions.is_empty() {
-                autocomplete::render_autocomplete_dropdown(f, input_rect, f.size(), theme, suggestions, selected);
+                if let Some(input_rect) = active_field_rect {
+                    autocomplete::render_autocomplete_dropdown(f, input_rect, f.size(), theme, suggestions, selected);
+                }    
             }
         }
     }

client/src/components/common/autocomplete.rs

@@ -59,8 +59,11 @@ pub fn render_autocomplete_dropdown(
         .enumerate()
         .map(|(i, s)| {
             let is_selected = selected_index == Some(i);
-            ListItem::new(s.as_str()).style(if is_selected {
+            let s_width = s.width() as u16;
-                // Style for selected item (highlight background)
+            let padding_needed = dropdown_width.saturating_sub(s_width);
+            let padded_s = format!("{}{}", s, " ".repeat(padding_needed as usize));
+
+            ListItem::new(padded_s).style(if is_selected {
                 Style::default()
                     .fg(theme.bg) // Text color on highlight
                     .bg(theme.highlight) // Highlight background

client/src/components/common/dialog.rs

@@ -1,13 +1,14 @@
-// src/components/common/dialog.rs
 use crate::config::colors::themes::Theme;
 use ratatui::{
     layout::{Constraint, Direction, Layout, Margin, Rect},
     prelude::Alignment,
     style::{Modifier, Style},
     text::{Line, Span, Text},
-    widgets::{Block, BorderType, Borders, Paragraph, Clear}, // Added Clear
+    widgets::{Block, BorderType, Borders, Paragraph, Clear},
     Frame,
 };
+use unicode_segmentation::UnicodeSegmentation; // For grapheme clusters
+use unicode_width::UnicodeWidthStr; // For accurate width calculation
 
 pub fn render_dialog(
     f: &mut Frame,
@@ -18,15 +19,16 @@ pub fn render_dialog(
     dialog_buttons: &[String],
     dialog_active_button_index: usize,
 ) {
+    // Calculate required height based on the actual number of lines in the message
     let message_lines: Vec<_> = dialog_message.lines().collect();
     let message_height = message_lines.len() as u16;
     let button_row_height = if dialog_buttons.is_empty() { 0 } else { 3 };
     let vertical_padding = 2; // Block borders (top/bottom)
     let inner_vertical_margin = 2; // Margin inside block (top/bottom)
 
+    // Calculate required height based on actual message lines
     let required_inner_height =
         message_height + button_row_height + inner_vertical_margin;
-    // Add block border height
     let required_total_height = required_inner_height + vertical_padding;
 
     // Use a fixed percentage width, clamped to min/max
@@ -61,10 +63,10 @@ pub fn render_dialog(
         vertical: 1,   // Top/Bottom padding inside border
     });
 
-    // Layout for Message and Buttons
+    // Layout for Message and Buttons based on actual message height
     let mut constraints = vec![
         // Allocate space for message, ensuring at least 1 line height
-        Constraint::Min(message_height.max(1)),
+        Constraint::Length(message_height.max(1)), // Use actual calculated height
     ];
     if button_row_height > 0 {
         constraints.push(Constraint::Length(button_row_height));
@@ -76,15 +78,39 @@ pub fn render_dialog(
         .split(inner_area);
 
     // Render Message
-    let message_text = Text::from(
+    let available_width = inner_area.width as usize;
+    let ellipsis = "...";
+    let ellipsis_width = UnicodeWidthStr::width(ellipsis);
+
+    let processed_lines: Vec<Line> =
         message_lines
             .into_iter()
-            .map(|l| Line::from(Span::styled(l, Style::default().fg(theme.fg))))
+            .map(|line| {
-            .collect::<Vec<_>>(),
+                let line_width = UnicodeWidthStr::width(line);
-    );
+                if line_width > available_width {
+                    // Truncate with ellipsis
+                    let mut truncated_len = 0;
+                    let mut current_width = 0;
+                    // Iterate over graphemes to handle multi-byte characters correctly
+                    for (idx, grapheme) in line.grapheme_indices(true) {
+                        let grapheme_width = UnicodeWidthStr::width(grapheme);
+                        if current_width + grapheme_width > available_width.saturating_sub(ellipsis_width) {
+                            break; // Stop before exceeding width needed for text + ellipsis
+                        }
+                        current_width += grapheme_width;
+                        truncated_len = idx + grapheme.len(); // Store the byte index of the end of the last fitting grapheme
+                    }
+                    let truncated_line = format!("{}{}", &line[..truncated_len], ellipsis);
+                    Line::from(Span::styled(truncated_line, Style::default().fg(theme.fg)))
+                } else {
+                    // Line fits, use it as is
+                    Line::from(Span::styled(line, Style::default().fg(theme.fg)))
+                }
+            })
+            .collect();
 
     let message_paragraph =
-        Paragraph::new(message_text).alignment(Alignment::Center);
+        Paragraph::new(Text::from(processed_lines)).alignment(Alignment::Center);
     // Render message in the first chunk
     f.render_widget(message_paragraph, chunks[0]);
 
@@ -143,4 +169,3 @@ pub fn render_dialog(
         }
     }
 }
-

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/canvas.rs

@@ -8,7 +8,7 @@ use ratatui::{
     prelude::Alignment,
 };
 use crate::config::colors::themes::Theme;
-use crate::state::canvas_state::CanvasState;
+use crate::state::pages::canvas_state::CanvasState;
 use crate::components::common::autocomplete;
 use crate::components::render_autocomplete_dropdown;
 

client/src/functions/modes.rs

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

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 => {
@@ -311,7 +311,7 @@ pub async fn execute_edit_action<S: CanvasState + Any + Send>(
                             register_state.selected_suggestion_index = Some(if current_index >= max_index { 0 } else { current_index + 1 });
                             Ok("Suggestion changed down".to_string())
                         }
-                        "suggestion_up" if register_state.show_role_suggestions => {
+                        "suggestion_up" if register_state.in_suggestion_mode => {
                             let max_index = register_state.role_suggestions.len().saturating_sub(1);
                             let current_index = register_state.selected_suggestion_index.unwrap_or(0);
                             register_state.selected_suggestion_index = Some(if current_index == 0 { max_index } else { current_index.saturating_sub(1) });
@@ -319,32 +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();
+                                if let Some(selected_role) = register_state.role_suggestions.get(index).cloned() {
-                                register_state.role = selected_role.clone(); // Update the role field
+                                    register_state.role = selected_role.clone(); // Update the role field
-                                register_state.in_suggestion_mode = false; // Exit suggestion mode
+                                    register_state.in_suggestion_mode = false; // Exit suggestion mode
-                                register_state.show_role_suggestions = false; // Hide suggestions
+                                    register_state.show_role_suggestions = false; // Hide suggestions
-                                register_state.selected_suggestion_index = None; // Clear selection
+                                    register_state.selected_suggestion_index = None; // Clear selection
-                                Ok(format!("Selected role: {}", selected_role)) // Return success message
+                                    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())
                         }
-                        _ => Ok("".to_string()) // Action doesn't apply in this state (e.g., suggestions not shown)
+                        _ => {
+                            // Action is suggestion-related but state doesn't match (e.g., not in suggestion mode)
+                            Ok("Suggestion action ignored: State mismatch.".to_string())
+                        }
                     }
                 } else {
-                    // Action received but not applicable to the current field
+                    // It's RegisterState, but not the role field
-                    Ok("".to_string())
+                    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,36 @@
+// src/functions/modes/navigation/admin_nav.rs
+
+use crate::state::app::state::AppState;
+use crate::state::pages::admin::AdminState;
+
+/// Handles moving the selection up in the admin profile list.
+pub fn move_admin_list_up(app_state: &AppState, admin_state: &mut AdminState) {
+    // Read profile count directly from app_state where the source data lives
+    let profile_count = app_state.profile_tree.profiles.len();
+    if profile_count == 0 {
+        admin_state.list_state.select(None); // Ensure nothing selected if empty
+        return;
+    }
+
+    let current_index = admin_state.get_selected_index().unwrap_or(0);
+    let new_index = if current_index == 0 {
+        profile_count - 1 // Wrap to end
+    } else {
+        current_index.saturating_sub(1) // Move up
+    };
+    admin_state.list_state.select(Some(new_index));
+}
+
+/// Handles moving the selection down in the admin profile list.
+pub fn move_admin_list_down(app_state: &AppState, admin_state: &mut AdminState) {
+    // Read profile count directly from app_state
+    let profile_count = app_state.profile_tree.profiles.len();
+    if profile_count == 0 {
+        admin_state.list_state.select(None); // Ensure nothing selected if empty
+        return;
+    }
+
+    let current_index = admin_state.get_selected_index().unwrap_or(0);
+    let new_index = (current_index + 1) % profile_count; // Wrap around
+    admin_state.list_state.select(Some(new_index));
+}

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::pages::canvas_state::CanvasState;
-use crate::state::state::AppState;
+use crate::state::app::state::AppState;
 use std::error::Error;
 
 #[derive(PartialEq)]

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::pages::{form::FormState, auth::LoginState, auth::RegisterState, auth::AuthState};
-use crate::state::state::AppState;
+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::pages::{auth::{LoginState, RegisterState}};
-use crate::state::canvas_state::CanvasState;
+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};
+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
@@ -82,29 +82,24 @@ pub async fn handle_edit_event(
     if let Some(action) = config.get_edit_action_for_key(key.code, key.modifiers) {
         // --- Special Handling for Tab/Shift+Tab in Role Field ---
         if app_state.ui.show_register && register_state.current_field() == 4 {
-            match action {
+            if !register_state.in_suggestion_mode && key.code == KeyCode::Tab && key.modifiers == KeyModifiers::NONE {
-                "suggestion_up" | "suggestion_down" => { // Mapped to Tab/Shift+Tab
+                register_state.update_role_suggestions();
-                    if !register_state.in_suggestion_mode {
+                if !register_state.role_suggestions.is_empty() {
-                        register_state.update_role_suggestions();
+                    register_state.in_suggestion_mode = true;
-                        if !register_state.role_suggestions.is_empty() {
+                    register_state.selected_suggestion_index = Some(0); // Select first suggestion
-                            register_state.in_suggestion_mode = true;
+                    return Ok("Suggestions shown".to_string());
-                            register_state.selected_suggestion_index = Some(0);
+                } else {
-                            return Ok("Suggestions shown".to_string());
+                    return Ok("No suggestions available".to_string());
-                        } else {
-                            return Ok("No suggestions available".to_string());
-                        }
-                    }
                 }
-                _ => {}
             }
         }
         // --- End Special Handling ---
-         
+
         return if app_state.ui.show_login {
             auth_e::execute_edit_action(
                 action,
                 key,
-                auth_state,
+                login_state,
                 ideal_cursor_column,
                 grpc_client,
                 current_position,
@@ -148,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,11 @@
 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::{canvas_state::CanvasState, auth::RegisterState};
 use crate::state::pages::auth::AuthState;
+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 +16,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 +35,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(),
+                login_state.get_current_input(),
-                auth_state.current_cursor_pos(),
+                login_state.current_cursor_pos(),
             )
         } else if app_state.ui.show_register { // Then check Register
             (
@@ -51,8 +52,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);
+                login_state.set_current_cursor_pos(current_pos + 1);
-                *ideal_cursor_column = auth_state.current_cursor_pos();
+                *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 +96,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(
+                crate::tui::functions::login::handle_action(action).await?
-                    action,
-                    auth_state,
-                    ideal_cursor_column,
-                )
-                .await?
             } else if app_state.ui.show_register{
                 auth_ro::execute_action(
                     action,
@@ -114,7 +110,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 +147,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(
+                    crate::tui::functions::login::handle_action(action).await?
-                        action,
-                        auth_state,
-                        ideal_cursor_column,
-                    )
-                    .await?
                 } else if app_state.ui.show_register /* && CONTEXT_ACTIONS_REGISTER.contains(&action) */ { // Handle register general actions
                     auth_ro::execute_action(
                         action,
@@ -170,7 +161,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 +197,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(
+                crate::tui::functions::login::handle_action(action).await?
-                    action,
-                    auth_state,
-                    ideal_cursor_column,
-                )
-                .await?
             } else if app_state.ui.show_register /* && CONTEXT_ACTIONS_REGISTER.contains(&action) */ { // Handle register general actions
                 auth_ro::execute_action(
                     action,
@@ -225,7 +211,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::app::state::AppState;
-use crate::state::pages::{form::FormState, auth::AuthState};
+use crate::state::pages::{form::FormState, auth::LoginState, auth::RegisterState};
-use crate::state::canvas_state::CanvasState;
+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,8 +3,9 @@
 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;
@@ -18,8 +19,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 +63,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,19 +2,24 @@
 
 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::pages::auth::LoginState;
-use crate::state::canvas_state::CanvasState;
+use crate::state::pages::auth::RegisterState;
+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;
+use crate::functions::modes::navigation::admin_nav;
 
 pub async fn handle_navigation_event(
     key: KeyEvent,
     config: &Config,
     form_state: &mut FormState,
     app_state: &mut AppState,
-    auth_state: &mut AuthState,
+    login_state: &mut LoginState,
+    register_state: &mut RegisterState,
+    admin_state: &mut AdminState,
     command_mode: &mut bool,
     command_input: &mut String,
     command_message: &mut String,
@@ -22,11 +27,11 @@ 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, admin_state);
                 return Ok(EventOutcome::Ok(String::new()));
             }
             "move_down" => {
-                move_down(app_state);
+                move_down(app_state, admin_state);
                 return Ok(EventOutcome::Ok(String::new()));
             }
             "next_option" => {
@@ -78,34 +83,28 @@ 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, 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 {
             app_state.ui.focus_outside_canvas = false;
-            let last_field_index = auth_state.fields().len().saturating_sub(1);
+            if app_state.ui.show_login {
-            auth_state.set_current_field(last_field_index);
+                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);
         }
     } else 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
+        admin_nav::move_admin_list_up(app_state, admin_state);
-        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) {
+pub fn move_down(app_state: &mut AppState, 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 {
@@ -120,7 +119,7 @@ pub fn move_down(app_state: &mut AppState) {
             return;
         }
 
-        app_state.general.selected_item = (app_state.general.selected_item + 1) % profile_count;
+        admin_nav::move_admin_list_down(app_state, admin_state);
     }
 }
 

client/src/modes/handlers/event.rs

@@ -8,8 +8,11 @@ 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::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 +68,10 @@ 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,
+        admin_state: &mut AdminState,
+        app_state: &mut AppState,
         total_count: u64,
         current_position: &mut u64,
     ) -> Result<EventOutcome, Box<dyn std::error::Error>> {
@@ -76,7 +81,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;
             }
@@ -102,7 +107,9 @@ impl EventHandler {
                         config,
                         form_state,
                         app_state,
-                        auth_state,
+                        login_state,
+                        register_state,
+                        admin_state,
                         &mut self.command_mode,
                         &mut self.command_input,
                         &mut self.command_message,
@@ -117,8 +124,8 @@ impl EventHandler {
                                 }
                                 UiContext::Login => {
                                     message = match index {
-                                        0 => login::save(auth_state, &mut self.auth_client, app_state).await?,
+                                        0 => login::save(auth_state, login_state, &mut self.auth_client, app_state).await?,
-                                        1 => login::back_to_main(auth_state, app_state).await,
+                                        1 => login::back_to_main(login_state, app_state).await,
                                         _ => "Invalid Login Option".to_string(),
                                     };
                                 }
@@ -130,8 +137,8 @@ impl EventHandler {
                                     };
                                 }
                                 UiContext::Admin => {
-                                    // Assuming handle_admin_selection uses app_state.general.selected_item
                                     admin::handle_admin_selection(app_state);
+
                                     message = format!("Admin Option {} selected", index);
                                 }
                                 UiContext::Dialog => {
@@ -157,20 +164,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);
+                                login_state.set_current_cursor_pos(current_cursor_pos + 1);
-                                self.ideal_cursor_column = auth_state.current_cursor_pos();
+                                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 +210,7 @@ impl EventHandler {
                                     action,
                                     form_state,
                                     auth_state,
+                                    login_state,
                                     register_state,
                                     grpc_client,
                                     &mut self.auth_client,
@@ -221,7 +229,7 @@ impl EventHandler {
                         key,
                         config,
                         form_state,
-                        auth_state,
+                        login_state,
                         register_state,
                         &mut self.key_sequence_tracker,
                         current_position,
@@ -240,7 +248,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 +262,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 +275,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);
+                                login_state.set_current_cursor_pos(new_pos);
-                                self.ideal_cursor_column = auth_state.current_cursor_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 +296,7 @@ impl EventHandler {
                                     action,
                                     form_state,
                                     auth_state,
+                                    login_state,
                                     register_state,
                                     grpc_client,
                                     &mut self.auth_client,
@@ -305,7 +314,7 @@ impl EventHandler {
                         key,
                         config,
                         form_state,
-                        auth_state,
+                        login_state,
                         register_state,
                         &mut self.ideal_cursor_column,
                         &mut self.command_message,
@@ -324,7 +333,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

@@ -27,11 +27,6 @@ pub struct UiState {
     pub dialog: DialogState,
 }
 
-pub struct GeneralState {
-    pub selected_item: usize,
-    pub current_option: usize,
-}
-
 pub struct AppState {
     // Core editor state
     pub current_dir: String,
@@ -43,7 +38,6 @@ pub struct AppState {
 
     // UI preferences
     pub ui: UiState,
-    pub general: GeneralState,
 }
 
 impl AppState {
@@ -59,10 +53,6 @@ impl AppState {
             selected_profile: None,
             current_mode: AppMode::General,
             ui: UiState::default(),
-            general: GeneralState {
-                selected_item: 0,
-                current_option: 0,
-            },
         })
     }
 

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,5 @@
 
 pub mod form;
 pub mod auth;
+pub mod admin;
+pub mod canvas_state;

client/src/state/pages/admin.rs

@@ -0,0 +1,38 @@
+// 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);
+        }
+    }
+}
+

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! {
@@ -11,21 +11,28 @@ lazy_static! {
     ];
 }
 
+/// Represents the authenticated session state
 #[derive(Default)]
 pub struct AuthState {
-    pub return_selected: bool,
+    pub auth_token: Option<String>,
+    pub user_id: Option<String>,
+    pub role: Option<String>,
+    pub decoded_username: Option<String>,
+}
+
+/// Represents the state of the Login form UI
+#[derive(Default)]
+pub struct LoginState {
     pub username: String,
     pub password: String,
     pub error_message: Option<String>,
     pub current_field: usize,
     pub current_cursor_pos: usize,
-    pub auth_token: Option<String>,
-    pub user_id: Option<String>,
-    pub role: Option<String>,
     pub has_unsaved_changes: bool,
 }
 
-#[derive(Default, Clone)] // Add Clone derive
+/// Represents the state of the Registration form UI
+#[derive(Default, Clone)]
 pub struct RegisterState {
     pub username: String,
     pub email: String,
@@ -43,23 +50,33 @@ pub struct RegisterState {
 }
 
 impl AuthState {
+    /// Creates a new empty AuthState (unauthenticated)
+    pub fn new() -> Self {
+        Self {
+            auth_token: None,
+            user_id: None,
+            role: None,
+            decoded_username: None,
+        }
+    }
+}
+
+impl LoginState {
+    /// Creates a new empty LoginState
     pub fn new() -> Self {
         Self {
-            return_selected: false,
             username: String::new(),
             password: String::new(),
             error_message: None,
             current_field: 0,
             current_cursor_pos: 0,
-            auth_token: None,
-            user_id: None,
-            role: None,
             has_unsaved_changes: false,
         }
     }
 }
 
 impl RegisterState {
+    /// Creates a new empty RegisterState
     pub fn new() -> Self {
         Self {
             username: String::new(),
@@ -78,7 +95,7 @@ impl RegisterState {
         }
     }
 
-    /// Updates role suggestions based on current input.
+    /// Updates role suggestions based on current input
     pub fn update_role_suggestions(&mut self) {
         let current_input = self.role.to_lowercase();
         self.role_suggestions = AVAILABLE_ROLES
@@ -90,7 +107,7 @@ impl RegisterState {
     }
 }
 
-impl CanvasState for AuthState {
+impl CanvasState for LoginState {
     fn current_field(&self) -> usize {
         self.current_field
     }
@@ -124,7 +141,7 @@ impl CanvasState for AuthState {
         match self.current_field {
             0 => &mut self.username,
             1 => &mut self.password,
-            _ => panic!("Invalid current_field index in AuthState"),
+            _ => panic!("Invalid current_field index in LoginState"),
         }
     }
 
@@ -133,13 +150,12 @@ impl CanvasState for AuthState {
     }
 
     fn set_current_field(&mut self, index: usize) {
-        if index < 2 { // AuthState only has 2 fields
+        if index < 2 {
             self.current_field = index;
-            // IMPORTANT: Clamp cursor position to the length of the NEW field
             let len = match self.current_field {
-               0 => self.username.len(),
+                0 => self.username.len(),
-               1 => self.password.len(),
+                1 => self.password.len(),
-               _ => 0,
+                _ => 0,
             };
             self.current_cursor_pos = self.current_cursor_pos.min(len);
         }
@@ -147,26 +163,23 @@ impl CanvasState for AuthState {
 
     fn set_current_cursor_pos(&mut self, pos: usize) {
         let len = match self.current_field {
-           0 => self.username.len(),
+            0 => self.username.len(),
-           1 => self.password.len(),
+            1 => self.password.len(),
-           _ => 0,
+            _ => 0,
         };
-        // Ensure stored position is always valid
         self.current_cursor_pos = pos.min(len);
     }
 
     fn set_has_unsaved_changes(&mut self, changed: bool) {
-        // Allow the generic handler to signal changes
         self.has_unsaved_changes = changed;
     }
 
-    // --- Autocomplete Support (Not Used for AuthState) ---
     fn get_suggestions(&self) -> Option<&[String]> {
-        None // AuthState doesn't provide suggestions
+        None
     }
 
     fn get_selected_suggestion_index(&self) -> Option<usize> {
-        None // AuthState doesn't have selected suggestions
+        None
     }
 }
 
@@ -229,12 +242,12 @@ impl CanvasState for RegisterState {
             "Email (Optional)",
             "Password (Optional)",
             "Confirm Password",
-            "Role (Oprional)"
+            "Role (Optional)"
         ]
     }
 
     fn set_current_field(&mut self, index: usize) {
-        if index < 5 { // RegisterState has 5 fields
+        if index < 5 {
             self.current_field = index;
             let len = match self.current_field {
                 0 => self.username.len(),
@@ -265,7 +278,6 @@ impl CanvasState for RegisterState {
     }
 
     fn get_suggestions(&self) -> Option<&[String]> {
-        // Only show suggestions for the role field (index 4) when requested
         if self.current_field == 4 && self.in_suggestion_mode && self.show_role_suggestions {
             Some(&self.role_suggestions)
         } else {

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/tui/functions/admin.rs

@@ -1,4 +1,4 @@
-use crate::state::state::AppState;
+use crate::state::app::state::AppState;
 
 pub fn handle_admin_selection(app_state: &mut AppState) {
     let profiles = &app_state.profile_tree.profiles;

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::pages::auth::LoginState;
-use crate::state::canvas_state::CanvasState;
+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 identifier = login_state.username.clone();
-    let password = auth_state.password.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();
 
@@ -28,25 +30,19 @@ pub async fn save(
             auth_state.auth_token = Some(response.access_token.clone());
             auth_state.user_id = Some(response.user_id.clone());
             auth_state.role = Some(response.role.clone());
-            auth_state.set_has_unsaved_changes(false);
+            auth_state.decoded_username = Some(response.username.clone());
+            login_state.set_has_unsaved_changes(false);
 
             let success_message = format!(
                 "Login Successful!\n\n\
-                 Access Token: {}\n\
+                 Username: {}\n\
-                 Token Type: {}\n\
-                 Expires In: {}\n\
                  User ID: {}\n\
                  Role: {}",
-                response.access_token,
+                response.username,
-                response.token_type,
-                response.expires_in,
                 response.user_id,
                 response.role
             );
 
-            // Use the helper method to configure and show the dialog
-            // TODO Implement logic for pressing menu or exit buttons, not imeplementing it now,
-            // need to do other more important stuff now"
             app_state.show_dialog(
                 "Login Success",
                 &success_message,
@@ -66,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))
         }
@@ -81,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();
+    login_state.username.clear();
-    auth_state.password.clear();
+    login_state.password.clear();
-    auth_state.error_message = None;
+    login_state.error_message = None;
-    auth_state.set_has_unsaved_changes(false);
+    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();
+    login_state.username.clear();
-    auth_state.password.clear();
+    login_state.password.clear();
-    auth_state.error_message = None;
+    login_state.error_message = None;
-    auth_state.set_has_unsaved_changes(false);
+    login_state.set_has_unsaved_changes(false);
 
     // Ensure dialog is hidden if revert is called
     app_state.hide_dialog(); // Uncomment if needed

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

@@ -4,8 +4,8 @@ use crate::{
     services::auth::AuthClient,
     state::{
         pages::auth::RegisterState,
-        state::AppState,
+        app::state::AppState,
-        canvas_state::CanvasState,
+        pages::canvas_state::CanvasState,
     },
     ui::handlers::context::DialogPurpose,
 };

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,4 +1,4 @@
-use crate::state::state::AppState;
+use crate::state::app::state::AppState;
 
 pub fn handle_intro_selection(app_state: &mut AppState, index: usize) { // Add index parameter
     match index { // Use index directly

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(
+pub async fn handle_action(action: &str,) -> Result<String, Box<dyn std::error::Error>> {
-    action: &str,
-    auth_state: &mut AuthState,
-    ideal_cursor_column: &mut usize,
-) -> 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;
 

client/src/ui/handlers/render.rs

@@ -14,13 +14,16 @@ 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::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,
     theme: &Theme,
     is_edit_mode: bool,
@@ -60,9 +63,9 @@ pub fn render_ui(
             f, 
             main_content_area, 
             theme, 
-            auth_state,
+            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
@@ -75,10 +78,9 @@ pub fn render_ui(
 
         // Set the selected item - FIXED
         if !admin_state.profiles.is_empty() {
-            let selected_index = std::cmp::min(
+            let selected_index = admin_state.get_selected_index()
-                app_state.general.selected_item,
+                .unwrap_or(0)
-                admin_state.profiles.len() - 1
+                .min(admin_state.profiles.len() - 1);
-            );
             admin_state.list_state.select(Some(selected_index));
         }
 

client/src/ui/handlers/ui.rs

@@ -7,11 +7,13 @@ 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::canvas_state::CanvasState;
-use crate::state::pages::auth::AuthState;
 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::app::state::AppState;
  // Import SaveOutcome
 use crate::tui::terminal::{EventReader, TerminalCore};
 use crate::ui::handlers::render::render_ui;
@@ -25,6 +27,8 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     let theme = Theme::from_str(&config.colors.theme);
     let mut auth_state = AuthState::default();
     let mut register_state = RegisterState::default();
+    let mut login_state = LoginState::default();
+    let mut admin_state = AdminState::default();
 
     // Initialize app_state first
     let mut app_state = AppState::new()?;
@@ -55,6 +59,7 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
                 f,
                 &mut form_state,
                 &mut auth_state,
+                &login_state,
                 &register_state,
                 &theme,
                 is_edit_mode,
@@ -108,14 +113,16 @@ 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 admin_state,
                 &mut app_state,
-                total_count, // Pass the count *before* potential save
+                total_count,
                 &mut current_position,
             )
             .await;
@@ -255,14 +262,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 =
+                login_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
-                    event_handler.ideal_cursor_column.min(max_cursor_pos);
             }
         }
 

common/proto/auth.proto

@@ -35,4 +35,5 @@ message LoginResponse {
     int32 expires_in = 3;      // Expiration in seconds (86400 for 24 hours)
     string user_id = 4;        // User's UUID in string format
     string role = 5;           // User's role
+    string username = 6;
 }

common/src/proto/multieko2.auth.rs

@@ -52,6 +52,8 @@ pub struct LoginResponse {
     /// User's role
     #[prost(string, tag = "5")]
     pub role: ::prost::alloc::string::String,
+    #[prost(string, tag = "6")]
+    pub username: ::prost::alloc::string::String,
 }
 /// Generated client implementations.
 pub mod auth_service_client {

server/src/auth/handlers/login.rs

@@ -11,7 +11,7 @@ pub async fn login(
 ) -> Result<Response<LoginResponse>, Status> {
     let user = sqlx::query!(
         r#"
-        SELECT id, password_hash, role
+        SELECT id, username, password_hash, role
         FROM users
         WHERE username = $1 OR email = $1
         "#,
@@ -33,7 +33,7 @@ pub async fn login(
         return Err(Status::unauthenticated("Invalid credentials"));
     }
 
-    let token = jwt::generate_token(user.id, &user.role)
+    let token = jwt::generate_token(user.id, &user.role, &user.username)
         .map_err(|e| Status::internal(e.to_string()))?;
 
     Ok(Response::new(LoginResponse {
@@ -42,5 +42,6 @@ pub async fn login(
         expires_in: 86400, // 24 hours
         user_id: user.id.to_string(),
         role: user.role,
+        username: user.username,
     }))
 }

server/src/auth/logic/jwt.rs

@@ -18,6 +18,7 @@ pub struct Claims {
     pub sub: Uuid,    // User ID
     pub exp: i64,     // Expiration time
     pub role: String, // User role
+    pub username: String,
 }
 
 pub fn init_jwt() -> Result<(), AuthError> {
@@ -32,7 +33,7 @@ pub fn init_jwt() -> Result<(), AuthError> {
     Ok(())
 }
 
-pub fn generate_token(user_id: Uuid, role: &str) -> Result<String, AuthError> {
+pub fn generate_token(user_id: Uuid, role: &str, username: &str) -> Result<String, AuthError> {
     let keys = KEYS.get().ok_or(AuthError::ConfigError("JWT not initialized".to_string()))?;
     
     let exp = OffsetDateTime::now_utc() + Duration::days(365000);
@@ -40,6 +41,7 @@ pub fn generate_token(user_id: Uuid, role: &str) -> Result<String, AuthError> {
         sub: user_id,
         exp: exp.unix_timestamp(),
         role: role.to_string(),
+        username: username.to_string(),
     };
 
     encode(&Header::default(), &claims, &keys.encoding)