diff --git a/src/floor/systems/movement.rs b/src/floor/systems/movement.rs
index bb5c30f..6a1e9e0 100644
--- a/src/floor/systems/movement.rs
+++ b/src/floor/systems/movement.rs
@@ -1,5 +1,3 @@
-use bevy::prelude::*;
-
 use crate::{
     floor::{
         components::{CurrentFloor, NextFloor},
@@ -8,12 +6,13 @@ use crate::{
     maze::{components::Maze, GlobalMazeConfig},
     player::components::{MovementSpeed, Player},
 };
+use bevy::prelude::*;
 
 pub(super) fn floor_movement(
     mut commands: Commands,
-    mut maze_transforms: Query<(Entity, &mut Transform), With<Maze>>,
-    current_floor: Query<Entity, With<CurrentFloor>>,
-    next_floor: Query<Entity, With<NextFloor>>,
+    mut maze_query: Query<(Entity, &mut Transform), With<Maze>>,
+    current_query: Query<Entity, With<CurrentFloor>>,
+    next_query: Query<Entity, With<NextFloor>>,
     player_query: Query<&MovementSpeed, With<Player>>,
     time: Res<Time>,
     global_config: Res<GlobalMazeConfig>,
@@ -23,37 +22,31 @@ pub(super) fn floor_movement(
     let movement_distance = speed * time.delta_secs();
 
     for event in event_reader.read() {
-        let (direction, target_y) = match event {
-            TransitionFloor::Ascend => (Vec3::Y, -global_config.height),
-            TransitionFloor::Descend => (Vec3::NEG_Y, global_config.height),
+        let y_offset = match event {
+            TransitionFloor::Ascend => -global_config.height,
+            TransitionFloor::Descend => global_config.height,
         };
 
-        let movement = direction * movement_distance;
-
-        for (_, mut transform) in maze_transforms.iter_mut() {
-            transform.translation += movement;
+        for (_, mut transforms) in maze_query.iter_mut() {
+            let target_y = transforms.translation.y + y_offset;
+            let delta = target_y - transforms.translation.y;
+            if delta.abs() > 0.001 {
+                let movement = delta.signum() * movement_distance.min(delta.abs());
+                transforms.translation.y += movement;
+            } else {
+                transforms.translation.y = target_y;
+            }
         }
 
-        let is_movement_complete = maze_transforms
-            .iter()
-            .any(|(_, t)| t.translation.y.abs() >= target_y.abs());
-
-        if is_movement_complete {
-            if let Ok(current_floor_entity) = current_floor.get_single() {
-                commands
-                    .entity(current_floor_entity)
-                    .remove::<CurrentFloor>();
-            }
-
-            if let Ok(next_floor_entity) = next_floor.get_single() {
-                if let Ok((entity, mut transform)) = maze_transforms.get_mut(next_floor_entity) {
-                    transform.translation.y = 0.;
-                    commands
-                        .entity(entity)
-                        .remove::<NextFloor>()
-                        .insert(CurrentFloor);
-                }
-            }
+        // Update current/next floor
+        if let (Ok(current_entity), Ok(next_entity)) =
+            (current_query.get_single(), next_query.get_single())
+        {
+            commands.entity(current_entity).remove::<CurrentFloor>();
+            commands
+                .entity(next_entity)
+                .remove::<NextFloor>()
+                .insert(CurrentFloor);
         }
     }
 }
diff --git a/src/maze/systems/setup.rs b/src/maze/systems/setup.rs
index 5ceceb2..b26c975 100644
--- a/src/maze/systems/setup.rs
+++ b/src/maze/systems/setup.rs
@@ -1,53 +1,6 @@
-use crate::{
-    floor::components::{CurrentFloor, Floor},
-    maze::{
-        assets::MazeAssets,
-        components::Maze,
-        events::SpawnMaze,
-        triggers::{
-            common::generate_maze,
-            spawn::{spawn_maze_tiles, FLOOR_Y_OFFSET},
-        },
-        GlobalMazeConfig,
-    },
-};
+use crate::maze::events::SpawnMaze;
 use bevy::prelude::*;
 
-pub(crate) fn setup(
-    mut commands: Commands,
-    mut meshes: ResMut<Assets<Mesh>>,
-    mut materials: ResMut<Assets<StandardMaterial>>,
-    maze_query: Query<(Entity, &Floor, &Maze)>,
-    global_config: Res<GlobalMazeConfig>,
-) {
-    let SpawnMaze { floor, config } = SpawnMaze::default();
-    if maze_query.iter().any(|(_, f, _)| f.0 == floor) {
-        warn!("Floor {} already exists, skipping creation", floor);
-        return;
-    }
-
-    let maze = generate_maze(&config).expect("Failed to generate maze during spawn");
-    let y_offset = (floor - 1) * FLOOR_Y_OFFSET;
-
-    let entity = commands
-        .spawn((
-            Name::new(format!("Floor {}", floor)),
-            Maze(maze.clone()),
-            Floor(floor),
-            CurrentFloor,
-            config.clone(),
-            Transform::from_translation(Vec3::ZERO.with_y(y_offset as f32)),
-            Visibility::Visible,
-        ))
-        .id();
-
-    let assets = MazeAssets::new(&mut meshes, &mut materials, &global_config);
-    spawn_maze_tiles(
-        &mut commands,
-        entity,
-        &maze,
-        &assets,
-        &config,
-        &global_config,
-    );
+pub(crate) fn setup(mut commands: Commands) {
+    commands.trigger(SpawnMaze::default());
 }
diff --git a/src/maze/triggers/spawn.rs b/src/maze/triggers/spawn.rs
index 0b88662..c92c50f 100644
--- a/src/maze/triggers/spawn.rs
+++ b/src/maze/triggers/spawn.rs
@@ -25,12 +25,20 @@ pub(super) fn spawn_maze(
     global_config: Res<GlobalMazeConfig>,
 ) {
     let SpawnMaze { floor, config } = trigger.event();
+
     if maze_query.iter().any(|(_, f, _)| f.0 == *floor) {
         warn!("Floor {} already exists, skipping creation", floor);
         return;
     }
 
-    let maze = generate_maze(config).expect("Failed to generate maze during spawn");
+    let maze = match generate_maze(&config) {
+        Ok(m) => m,
+        Err(e) => {
+            error!("Failed to generate maze for floor {floor}: {:?}", e);
+            return;
+        }
+    };
+
     let y_offset = (floor - 1) * FLOOR_Y_OFFSET;
 
     let entity = commands
@@ -38,11 +46,12 @@ pub(super) fn spawn_maze(
             Name::new(format!("Floor {}", floor)),
             Maze(maze.clone()),
             Floor(*floor),
-            NextFloor,
             config.clone(),
             Transform::from_translation(Vec3::ZERO.with_y(y_offset as f32)),
             Visibility::Visible,
         ))
+        .insert_if(CurrentFloor, || *floor == 1)
+        .insert_if(NextFloor, || *floor != 1)
         .id();
 
     let assets = MazeAssets::new(&mut meshes, &mut materials, &global_config);
@@ -51,7 +60,7 @@ pub(super) fn spawn_maze(
         entity,
         &maze,
         &assets,
-        config,
+        &config,
         &global_config,
     );
 }