diff --git a/src/LayerSurface.zig b/src/LayerSurface.zig
index 6ddb071..fb72b47 100644
--- a/src/LayerSurface.zig
+++ b/src/LayerSurface.zig
@@ -31,7 +31,6 @@ pub fn init(wlr_layer_surface: *wlr.LayerSurfaceV1) *LayerSurface {
     .scene_layer_surface = undefined,
   };
 
-// try server.root.scene.tree.createSceneLayerSurfaceV1(wlr_layer_surface)
   if(server.seat.focused_output) |output| {
     self.scene_layer_surface = switch (wlr_layer_surface.current.layer) {
       .background => try output.layers.background.createSceneLayerSurfaceV1(wlr_layer_surface),
@@ -97,5 +96,5 @@ fn handleCommit(
   layer_surface.output.wlr_output.effectiveResolution(&width, &height);
   _ = layer_surface.wlr_layer_surface.configure(@intCast(width), @intCast(height));
 
-  layer_surface.scene_layer_surface.tree.node.reparent(&layer_surface.output.scene_output.scene.tree);
+  layer_surface.scene_layer_surface.tree.node.reparent(layer_surface.output.layers.background);
 }
diff --git a/src/View.zig b/src/View.zig
index 2afd78c..552d0a8 100644
--- a/src/View.zig
+++ b/src/View.zig
@@ -65,13 +65,10 @@ pub fn initFromTopLevel(xdg_toplevel: *wlr.XdgToplevel) *View {
   // Add new Toplevel to root of the tree
   // Later add to spesified output
   if(server.seat.focused_output) |output| {
-    std.log.debug("adding new view to content layer", .{});
     self.scene_tree = try output.layers.content.createSceneXdgSurface(xdg_toplevel.base);
-    // _ = output;
-    // self.scene_tree = try server.root.scene.tree.createSceneXdgSurface(xdg_toplevel.base);
   } else {
-    self.scene_tree = try server.root.waiting_room.createSceneXdgSurface(xdg_toplevel.base);
     std.log.err("No output to attach new view to", .{});
+    self.scene_tree = try server.root.waiting_room.createSceneXdgSurface(xdg_toplevel.base);
   }
 
   self.scene_tree.node.data = self;