--- a/gui.d	Sat Jul 11 23:32:22 2009 +0930
+++ b/gui.d	Sun Jul 12 00:39:35 2009 +0930
@@ -2,7 +2,7 @@
 
 import icanvas;
 import canvas;
-import tool_stack;
+import tool_layer;
 import tool;
 import standard_tools;
 import page_layer;
@@ -23,10 +23,11 @@
     Tool[] tools;
     tools ~= new PanTool;
     tools ~= new ZoomTool;
-    auto event_handler = new ToolStack(tools);
+    auto tool_layer = new ToolLayer(tools, "Tools");
     Layer[] layers;
-    layers ~= new PageLayer;
-    auto canvas = new Canvas(layers, event_handler, 120.0);
+    layers ~= new PageLayer("Page");
+    layers ~= tool_layer;
+    auto canvas = new Canvas(layers, tool_layer, 120.0);
     window.add(canvas);
     window.setDefaultSize(420, 340);
     window.showAll();