diff --git a/client/src/components/form/form.rs b/client/src/components/form/form.rs
index bbf4591..72c1c51 100644
--- a/client/src/components/form/form.rs
+++ b/client/src/components/form/form.rs
@@ -6,7 +6,7 @@ use ratatui::{
     Frame,
 };
 use crate::config::colors::themes::Theme;
-use crate::ui::form::FormState;
+use crate::state::pages::form::FormState;
 use crate::components::handlers::canvas::render_canvas;
 
 pub fn render_form(
diff --git a/client/src/components/handlers/canvas.rs b/client/src/components/handlers/canvas.rs
index 17f5225..ac4d5e8 100644
--- a/client/src/components/handlers/canvas.rs
+++ b/client/src/components/handlers/canvas.rs
@@ -8,7 +8,7 @@ use ratatui::{
     prelude::Alignment,
 };
 use crate::config::colors::themes::Theme;
-use crate::ui::form::FormState;
+use crate::state::pages::form::FormState;
 
 pub fn render_canvas(
     f: &mut Frame,
diff --git a/client/src/components/intro/intro.rs b/client/src/components/intro/intro.rs
index 6b97f85..3082632 100644
--- a/client/src/components/intro/intro.rs
+++ b/client/src/components/intro/intro.rs
@@ -112,7 +112,7 @@ impl IntroState {
     }
 
  pub fn next_option(&mut self) {
-        self.selected_option = (self.selected_option + 1) % 3; // Now 3 options
+        self.selected_option = (self.selected_option + 1) % 3;
     }
 
     pub fn previous_option(&mut self) {
diff --git a/client/src/modes/canvas/common.rs b/client/src/modes/canvas/common.rs
index 0ac3c24..1cd9a4b 100644
--- a/client/src/modes/canvas/common.rs
+++ b/client/src/modes/canvas/common.rs
@@ -5,7 +5,7 @@ use crate::config::binds::config::Config;
 use crate::tui::terminal::grpc_client::GrpcClient;
 use crate::tui::terminal::core::TerminalCore;
 use crate::tui::controls::commands::CommandHandler;
-use crate::ui::handlers::form::FormState;
+use crate::state::pages::form::FormState;
 use crate::state::state::AppState;
 use common::proto::multieko2::adresar::{PostAdresarRequest, PutAdresarRequest};
 
diff --git a/client/src/modes/canvas/edit.rs b/client/src/modes/canvas/edit.rs
index e8a496b..6a15d11 100644
--- a/client/src/modes/canvas/edit.rs
+++ b/client/src/modes/canvas/edit.rs
@@ -6,7 +6,7 @@ use crate::tui::terminal::{
     grpc_client::GrpcClient,
 };
 use crate::config::binds::config::Config;
-use crate::ui::handlers::form::FormState;
+use crate::state::pages::form::FormState;
 use crate::modes::canvas::common;
 
 pub async fn handle_edit_event_internal(
diff --git a/client/src/modes/canvas/read_only.rs b/client/src/modes/canvas/read_only.rs
index 7743084..163b3b2 100644
--- a/client/src/modes/canvas/read_only.rs
+++ b/client/src/modes/canvas/read_only.rs
@@ -2,7 +2,7 @@
 
 use crossterm::event::{KeyEvent};
 use crate::config::binds::config::Config;
-use crate::ui::handlers::form::FormState;
+use crate::state::pages::form::FormState;
 use crate::config::binds::key_sequences::KeySequenceTracker;
 use crate::tui::terminal::grpc_client::GrpcClient;
 
diff --git a/client/src/modes/common/command_mode.rs b/client/src/modes/common/command_mode.rs
index 1de7d81..7fe79d7 100644
--- a/client/src/modes/common/command_mode.rs
+++ b/client/src/modes/common/command_mode.rs
@@ -3,7 +3,7 @@
 use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
 use crate::tui::terminal::grpc_client::GrpcClient;
 use crate::config::binds::config::Config;
-use crate::ui::handlers::form::FormState;
+use crate::state::pages::form::FormState;
 use crate::tui::controls::commands::CommandHandler;
 use crate::tui::terminal::core::TerminalCore;
 use crate::modes::{
diff --git a/client/src/modes/general/navigation.rs b/client/src/modes/general/navigation.rs
index 1c68747..5cf4082 100644
--- a/client/src/modes/general/navigation.rs
+++ b/client/src/modes/general/navigation.rs
@@ -3,7 +3,7 @@
 use crossterm::event::KeyEvent;
 use crate::config::binds::config::Config;
 use crate::state::state::AppState;
-use crate::ui::handlers::form::FormState;
+use crate::state::pages::form::FormState;
 
 pub async fn handle_navigation_event(
     key: KeyEvent,
diff --git a/client/src/modes/handlers/event.rs b/client/src/modes/handlers/event.rs
index 63558b0..d3abda1 100644
--- a/client/src/modes/handlers/event.rs
+++ b/client/src/modes/handlers/event.rs
@@ -7,7 +7,7 @@ use crate::tui::terminal::{
 };
 use crate::tui::controls::commands::CommandHandler;
 use crate::config::binds::config::Config;
-use crate::ui::handlers::form::FormState;
+use crate::state::pages::form::FormState;
 use crate::ui::handlers::rat_state::UiStateHandler;
 use crate::modes::{
     common::{command_mode},
diff --git a/client/src/state/mod.rs b/client/src/state/mod.rs
index 130cd04..6dc5624 100644
--- a/client/src/state/mod.rs
+++ b/client/src/state/mod.rs
@@ -1,2 +1,3 @@
 // src/state/mod.rs
 pub mod state;
+pub mod pages;
diff --git a/client/src/state/pages.rs b/client/src/state/pages.rs
new file mode 100644
index 0000000..9f5f7c7
--- /dev/null
+++ b/client/src/state/pages.rs
@@ -0,0 +1,3 @@
+// src/state/pages.rs
+
+pub mod form;
diff --git a/client/src/ui/handlers/form.rs b/client/src/state/pages/form.rs
similarity index 98%
rename from client/src/ui/handlers/form.rs
rename to client/src/state/pages/form.rs
index 88d1465..d3dbd2a 100644
--- a/client/src/ui/handlers/form.rs
+++ b/client/src/state/pages/form.rs
@@ -1,4 +1,4 @@
-// src/client/ui/handlers/form.rs
+// src/state/pages/form.rs
 use crate::config::colors::themes::Theme;
 use ratatui::layout::Rect;
 use ratatui::Frame;
diff --git a/client/src/ui/handlers.rs b/client/src/ui/handlers.rs
index cbee7e7..e0b8cbe 100644
--- a/client/src/ui/handlers.rs
+++ b/client/src/ui/handlers.rs
@@ -1,7 +1,6 @@
 // src/client/ui/handlers.rs
 
 pub mod ui;
-pub mod form;
 pub mod render;
 pub mod rat_state;
 
diff --git a/client/src/ui/handlers/render.rs b/client/src/ui/handlers/render.rs
index 5e2362d..b8a4c4e 100644
--- a/client/src/ui/handlers/render.rs
+++ b/client/src/ui/handlers/render.rs
@@ -12,7 +12,7 @@ use crate::components::{
 use crate::config::colors::themes::Theme;
 use ratatui::layout::{Constraint, Direction, Layout};
 use ratatui::Frame;
-use super::form::FormState;
+use crate::state::pages::form::FormState;
 use crate::state::state::AppState;
 
 pub fn render_ui(
diff --git a/client/src/ui/handlers/ui.rs b/client/src/ui/handlers/ui.rs
index 3ef737c..8e25617 100644
--- a/client/src/ui/handlers/ui.rs
+++ b/client/src/ui/handlers/ui.rs
@@ -6,7 +6,8 @@ use crate::tui::controls::CommandHandler;
 use crate::tui::terminal::EventReader;
 use crate::config::colors::themes::Theme;
 use crate::config::binds::config::Config;
-use crate::ui::handlers::{form::FormState, render::render_ui};
+use crate::ui::handlers::render::render_ui;
+use crate::state::pages::form::FormState;
 use crate::modes::handlers::event::EventHandler;
 use crate::state::state::AppState;
 use crate::components::admin::{admin_panel::AdminPanelState};