diff --git a/client/src/components/handlers/buffer_list.rs b/client/src/components/handlers/buffer_list.rs
index 75aa040..4fe49f9 100644
--- a/client/src/components/handlers/buffer_list.rs
+++ b/client/src/components/handlers/buffer_list.rs
@@ -2,8 +2,9 @@
 
 use crate::config::colors::themes::Theme;
 use crate::state::app::state::AppState;
-use crate::state::app::buffer::{BufferState, AppView};
-use ratatui::buffer::{
+// use crate::state::app::buffer::AppView;
+use crate::state::app::buffer::BufferState;
+use ratatui::{
     layout::{Alignment, Rect},
     style::{Style, Stylize},
     text::{Line, Span},
diff --git a/client/src/modes/handlers/event.rs b/client/src/modes/handlers/event.rs
index 89ce2de..0df340c 100644
--- a/client/src/modes/handlers/event.rs
+++ b/client/src/modes/handlers/event.rs
@@ -1,33 +1,42 @@
 // src/modes/handlers/event.rs
 use crossterm::event::Event;
 use crossterm::cursor::SetCursorStyle;
-use crate::tui::terminal::core::TerminalCore;
 use crate::services::grpc_client::GrpcClient;
 use crate::services::auth::AuthClient;
-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::pages::intro::IntroState;
-use crate::state::pages::admin::AdminState;
-use crate::state::app::state::AppState;
-use crate::state::app::buffer::{AppView, BufferState};
-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};
-use crate::tui::functions::common::{login, register};
+use crate::tui::{
+    terminal::core::TerminalCore,
+    functions::{
+        common::{
+            form::SaveOutcome,
+            login,
+            register,
+        },
+    },
+    {intro, admin},
+};
+use crate::state::{
+    app::{
+        state::AppState,
+        buffer::{AppView, BufferState},
+    },
+    pages::{
+        auth::{AuthState, LoginState, RegisterState},
+        admin::AdminState,
+        canvas_state::CanvasState,
+        form::FormState,
+        intro::IntroState,
+    },
+};
 use crate::modes::{
-    common::command_mode,
+    common::{command_mode, commands::CommandHandler},
+    handlers::mode_manager::{ModeManager, AppMode},
     canvas::{edit, read_only, common_mode},
     general::{navigation, dialog},
 };
 use crate::config::binds::key_sequences::KeySequenceTracker;
-use crate::modes::handlers::mode_manager::{ModeManager, AppMode};
-use crate::state::app::state::AppView;
-use crate::tui::functions::common::form::SaveOutcome;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum EventOutcome {
@@ -75,6 +84,7 @@ impl EventHandler {
         register_state: &mut RegisterState,
         intro_state: &mut IntroState,
         admin_state: &mut AdminState,
+        buffer_state: &mut BufferState,
         app_state: &mut AppState,
         total_count: u64,
         current_position: &mut u64,
diff --git a/client/src/ui/handlers/ui.rs b/client/src/ui/handlers/ui.rs
index 0eafdd6..e05e2d7 100644
--- a/client/src/ui/handlers/ui.rs
+++ b/client/src/ui/handlers/ui.rs
@@ -62,8 +62,8 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
                 &login_state,
                 &register_state,
                 &intro_state,
-                &buffer_state,
                 &mut admin_state,
+                &buffer_state,
                 &theme,
                 is_edit_mode,
                 app_state.total_count,
@@ -124,8 +124,8 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
                 &mut login_state,
                 &mut register_state,
                 &mut intro_state,
-                &mut buffer_state,
                 &mut admin_state,
+                &mut buffer_state,
                 &mut app_state,
                 total_count,
                 &mut current_position,