diff --git a/src/app/editor/dungeon_editor.cc b/src/app/editor/dungeon_editor.cc
index 43b0230c..a8700ad6 100644
--- a/src/app/editor/dungeon_editor.cc
+++ b/src/app/editor/dungeon_editor.cc
@@ -8,7 +8,10 @@ namespace editor {
 
 void DungeonEditor::Update() {
   DrawToolset();
-  canvas_.Update();
+  canvas_.DrawBackground();
+  canvas_.UpdateContext();
+  canvas_.DrawGrid();
+  canvas_.DrawOverlay();
 }
 
 void DungeonEditor::DrawToolset() {
diff --git a/src/gui/canvas.cc b/src/gui/canvas.cc
index 92062803..c7b237e1 100644
--- a/src/gui/canvas.cc
+++ b/src/gui/canvas.cc
@@ -8,89 +8,6 @@
 namespace yaze {
 namespace gui {
 
-void Canvas::Update() {
-  ImVec2 canvas_p0 = ImGui::GetCursorScreenPos();
-  if (!custom_canvas_size_) canvas_sz_ = ImGui::GetContentRegionAvail();
-
-  auto canvas_p1 =
-      ImVec2(canvas_p0.x + canvas_sz_.x, canvas_p0.y + canvas_sz_.y);
-
-  // Draw border and background color
-  const ImGuiIO &io = ImGui::GetIO();
-  ImDrawList *draw_list = ImGui::GetWindowDrawList();
-  draw_list->AddRectFilled(canvas_p0, canvas_p1, IM_COL32(32, 32, 32, 255));
-  draw_list->AddRect(canvas_p0, canvas_p1, IM_COL32(255, 255, 255, 255));
-
-  // This will catch our interactions
-  ImGui::InvisibleButton(
-      "canvas", canvas_sz_,
-      ImGuiButtonFlags_MouseButtonLeft | ImGuiButtonFlags_MouseButtonRight);
-  const bool is_hovered = ImGui::IsItemHovered();  // Hovered
-  const bool is_active = ImGui::IsItemActive();    // Held
-  const ImVec2 origin(canvas_p0.x + scrolling_.x,
-                      canvas_p0.y + scrolling_.y);  // Lock scrolled origin
-  const ImVec2 mouse_pos_in_canvas(io.MousePos.x - origin.x,
-                                   io.MousePos.y - origin.y);
-
-  // Add first and second point
-  if (is_hovered && !dragging_select_ &&
-      ImGui::IsMouseClicked(ImGuiMouseButton_Left)) {
-    points_.push_back(mouse_pos_in_canvas);
-    points_.push_back(mouse_pos_in_canvas);
-    dragging_select_ = true;
-  }
-  if (dragging_select_) {
-    points_.back() = mouse_pos_in_canvas;
-    if (!ImGui::IsMouseDown(ImGuiMouseButton_Left)) dragging_select_ = false;
-  }
-
-  // Pan (we use a zero mouse threshold when there's no context menu)
-  const float mouse_threshold_for_pan = enable_context_menu_ ? -1.0f : 0.0f;
-  if (is_active &&
-      ImGui::IsMouseDragging(ImGuiMouseButton_Right, mouse_threshold_for_pan)) {
-    scrolling_.x += io.MouseDelta.x;
-    scrolling_.y += io.MouseDelta.y;
-  }
-
-  // Context menu (under default mouse threshold)
-  ImVec2 drag_delta = ImGui::GetMouseDragDelta(ImGuiMouseButton_Right);
-  if (enable_context_menu_ && drag_delta.x == 0.0f && drag_delta.y == 0.0f)
-    ImGui::OpenPopupOnItemClick("context", ImGuiPopupFlags_MouseButtonRight);
-  if (ImGui::BeginPopup("context")) {
-    if (dragging_select_) points_.resize(points_.size() - 2);
-    dragging_select_ = false;
-    if (ImGui::MenuItem("Remove all", nullptr, false, points_.Size > 0)) {
-      points_.clear();
-    }
-    ImGui::EndPopup();
-  }
-
-  // Draw grid + all lines in the canvas
-  draw_list->PushClipRect(canvas_p0, canvas_p1, true);
-  if (enable_grid_) {
-    const float GRID_STEP = 64.0f;
-    for (float x = fmodf(scrolling_.x, GRID_STEP); x < canvas_sz_.x;
-         x += GRID_STEP)
-      draw_list->AddLine(ImVec2(canvas_p0.x + x, canvas_p0.y),
-                         ImVec2(canvas_p0.x + x, canvas_p1.y),
-                         IM_COL32(200, 200, 200, 40));
-    for (float y = fmodf(scrolling_.y, GRID_STEP); y < canvas_sz_.y;
-         y += GRID_STEP)
-      draw_list->AddLine(ImVec2(canvas_p0.x, canvas_p0.y + y),
-                         ImVec2(canvas_p1.x, canvas_p0.y + y),
-                         IM_COL32(200, 200, 200, 40));
-  }
-
-  for (int n = 0; n < points_.Size; n += 2) {
-    draw_list->AddRect(
-        ImVec2(origin.x + points_[n].x, origin.y + points_[n].y),
-        ImVec2(origin.x + points_[n + 1].x, origin.y + points_[n + 1].y),
-        IM_COL32(255, 255, 255, 255), 1.0f);
-  }
-
-  draw_list->PopClipRect();
-}
-
 void Canvas::DrawBackground(ImVec2 canvas_size) {
   canvas_p0_ = ImGui::GetCursorScreenPos();
   if (!custom_canvas_size_) canvas_sz_ = ImGui::GetContentRegionAvail();
diff --git a/src/gui/canvas.h b/src/gui/canvas.h
index 31b09714..dda7e970 100644
--- a/src/gui/canvas.h
+++ b/src/gui/canvas.h
@@ -15,8 +15,6 @@ class Canvas {
   Canvas(ImVec2 canvas_size)
       : custom_canvas_size_(true), canvas_sz_(canvas_size) {}
 
-  void Update();
-
   void DrawBackground(ImVec2 canvas_size = ImVec2(0, 0));
   void UpdateContext();
   void DrawGrid(float grid_step = 64.0f);