diff --git a/src/tui/mod.rs b/src/tui/mod.rs
index f96a68a..c6ea950 100644
--- a/src/tui/mod.rs
+++ b/src/tui/mod.rs
@@ -54,20 +54,20 @@ impl Plugin for RiichiTui {
 
         // console
         .init_state::<console::ConsoleState>()
-        .add_systems(Update, console::draw_console.after_ignore_deferred(draw_mainmenu).after_ignore_deferred(draw_ingame).run_if(in_state(console::ConsoleState::Open)))
+        .add_systems(Last, console::draw_console.run_if(in_state(console::ConsoleState::Open)))
 
         // general setup
         .init_state::<TuiState>()
         .add_computed_state::<InGame>()
-        .add_systems(Update, input::kb_input_system)
+        .add_systems(PreUpdate, input::kb_input_system)
 
         // main menu
-        .add_systems(Update, menu::draw_mainmenu.run_if(in_state(TuiState::MainMenu)))
+        .add_systems(PostUpdate, menu::draw_mainmenu.run_if(in_state(TuiState::MainMenu)))
 
         // gaming
         .init_resource::<render::hand::RenderedHand>()
-        .add_systems(Update, render::ingame::draw_ingame.run_if(in_state(InGame)))
         .add_systems(Update, render::hand::render_hand.run_if(in_state(InGame).and(in_state(GameState::Play))))
+        .add_systems(PostUpdate, render::ingame::draw_ingame.run_if(in_state(InGame)))
         
         // semicolon stopper
         ;