diff --git a/GormCore/English.lproj/GormObjectInspector.gorm/data.info b/GormCore/English.lproj/GormObjectInspector.gorm/data.info
index 744f736a..70a46922 100644
Binary files a/GormCore/English.lproj/GormObjectInspector.gorm/data.info and b/GormCore/English.lproj/GormObjectInspector.gorm/data.info differ
diff --git a/GormCore/English.lproj/GormObjectInspector.gorm/objects.gorm b/GormCore/English.lproj/GormObjectInspector.gorm/objects.gorm
index 51c02ccf..d4ff35ad 100644
Binary files a/GormCore/English.lproj/GormObjectInspector.gorm/objects.gorm and b/GormCore/English.lproj/GormObjectInspector.gorm/objects.gorm differ
diff --git a/GormCore/GormDocument.m b/GormCore/GormDocument.m
index 18f689cb..a1fc8f4f 100644
--- a/GormCore/GormDocument.m
+++ b/GormCore/GormDocument.m
@@ -4069,7 +4069,9 @@ willBeInsertedIntoToolbar: (BOOL)flag
       if ([item respondsToSelector: @selector(title)])
 	{
 	  title = [item title];
-	  value = [NSString stringWithFormat: @"%@ : %@", title, (name != nil)?name:@"*Unnamed*"];
+	  value = [NSString stringWithFormat: @"%@ : %@",
+			    (title != nil && ![title isEqualToString: @""]) ? title : @"*Untitled*",
+		       (name != nil) ? name : @"*Unnamed*"];
 	}
       else
 	{
diff --git a/GormCore/GormObjectInspector.m b/GormCore/GormObjectInspector.m
index 76614e9a..452e66af 100644
--- a/GormCore/GormObjectInspector.m
+++ b/GormCore/GormObjectInspector.m
@@ -42,12 +42,7 @@
       sets = [[NSMutableArray alloc] init];
       gets = [[NSMutableDictionary alloc] init];
       types = [[NSMutableDictionary alloc] init];
-      
-      okButton = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,90,20)];
-      [okButton setAutoresizingMask: NSViewMaxYMargin | NSViewMinXMargin];
-      [okButton setAction: @selector(ok:)];
-      [okButton setTarget: self];
-      [okButton setTitle: _(@"OK")];
+
       [okButton setEnabled: NO];
       
       revertButton = nil;
@@ -96,7 +91,6 @@ selectCellWithString: (NSString*)title
   RELEASE(gets);
   RELEASE(sets);
   RELEASE(types);
-  RELEASE(okButton);
   [super dealloc];
 }
 
diff --git a/GormCore/Resources/ClassInformation.plist b/GormCore/Resources/ClassInformation.plist
index c3d6c500..8c670922 100644
--- a/GormCore/Resources/ClassInformation.plist
+++ b/GormCore/Resources/ClassInformation.plist
@@ -149,7 +149,7 @@
     }; 
     IBInspector = {
         Actions = ("ok:", "revert:", "touch:"); 
-        Outlets = (window); 
+        Outlets = (window, okButton, revertButton); 
         Super = NSObject; 
     }; 
     IBPalette = {Actions = (); Outlets = (originalWindow); Super = NSObject; };