  	g->tool_bar->AddChild(g->home_button);
  	nButtons++;
  
-@@ -2407,3 +2508,4 @@ void nsbeos_scaffolding_popup_menu(nsbeos_scaffolding *g, BPoint where)
+@@ -2407,3 +2528,4 @@ void nsbeos_scaffolding_popup_menu(nsbeos_scaffolding *g, BPoint where)
  {
  	g->popup_menu->Go(where);
  }
 +
 diff --git a/beos/scaffolding.h b/beos/scaffolding.h
-index ae78391..d456c0c 100644
+index ae78391..bd13230 100644
 --- a/beos/scaffolding.h
 +++ b/beos/scaffolding.h
-@@ -29,6 +29,8 @@ extern "C" {
- #include "desktop/plotters.h"
- }
- 
-+class BWindowStack;
-+
- typedef struct beos_scaffolding nsbeos_scaffolding;
- 
- class NSBaseView : public BView {
-@@ -66,6 +68,8 @@ struct beos_scaffolding *Scaffolding() const { return fScaffolding; };
- 
+@@ -61,11 +61,15 @@ virtual	~NSBrowserWindow();
+ virtual	void	DispatchMessage(BMessage *message, BHandler *handler);
+ virtual void	MessageReceived(BMessage *message);
+ virtual bool	QuitRequested(void);
++void			WindowActivated(bool active);
+ 
+ struct beos_scaffolding *Scaffolding() const { return fScaffolding; };
+ 
++static BWindow* activeWindow;
  private:
  	struct beos_scaffolding *fScaffolding;
 +
-+	static BWindowStack* stack;
++
  };
  
  

 nsbeos_scaffolding *nsbeos_new_scaffolding(struct gui_window *toplevel)
 {
 	struct beos_scaffolding *g = (struct beos_scaffolding *)malloc(sizeof(*g));
@@ -2038,14 +2140,13 @@ nsbeos_scaffolding *nsbeos_new_scaffolding(struct gui_window *toplevel)
 	rect = g->top_view->Bounds();
 	rect.bottom = rect.top + TOOLBAR_HEIGHT - 1;
 	rect.right = rect.right - DRAGGER_WIDTH;

 
 # ----------------------------------------------------------------------------
 # Package target
diff --git a/beos/fetch_rsrc.cpp b/beos/fetch_rsrc.cpp
index 79dea4e..563f431 100644
--- a/beos/fetch_rsrc.cpp
+++ b/beos/fetch_rsrc.cpp
@@ -48,6 +48,7 @@ extern "C" {
 
 #include <image.h>
 #include <Resources.h>
+#include <String.h>
 
 struct fetch_rsrc_context {
 	struct fetch *parent_fetch;
@@ -209,8 +210,13 @@ static bool fetch_rsrc_process(struct fetch_rsrc_context *c)
 	else
 		found = gAppResources->HasResource(type, c->name);
 	if (!found) {
+		BString error("Cannot locate resource: ");
+		if (id)
+			error << id;
+		else
+			error << c->name;
 		msg.type = FETCH_ERROR;
-		msg.data.error = "Cannot locate rsrc: URL";
+		msg.data.error = error.String();
 		fetch_rsrc_send_callback(&msg, c);
 		return false;
 	}
diff --git a/beos/gui.cpp b/beos/gui.cpp
index b275616..3f7e943 100644
--- a/beos/gui.cpp
