diff --git a/Documentation/ChangeLog b/Documentation/ChangeLog
index 8445916..a79a4c8 100644
--- a/Documentation/ChangeLog
+++ b/Documentation/ChangeLog
@@ -6,9 +6,13 @@
 	* Library/PCProjectBuilder.m: Use new tooltip code and remove old
 	style code.
 	* Library/PCProjectLauncher.m: ditto.
-	* Library/PCProjectWindow.m: ditto.
+	* Library/PCProjectWindow.m: ditto. Editor button replaced with
+	Loaded Files button.
+	* Library/PCProjectInspector.m: Remove textfields linking programmatically 
+	and make it using GORM. Fix applying changes to textfields.
 	
-	*Images/ButtonTile.tiff: removed.
+	* Images/ButtonTile.tiff: removed.
+	* Images/Editor.tiff: removed.
 	
 2004-07-15 Serg Stoyan <stoyan255@ukr.net>
 
diff --git a/GNUmakefile b/GNUmakefile
index efe6930..d432b14 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -48,7 +48,6 @@ Images/MultiFiles.tiff \
 Images/Options.tiff \
 Images/Run.tiff \
 Images/Stop.tiff \
-Images/Editor.tiff \
 Images/ProjectCenter_add.tiff \
 Images/ProjectCenter_cvs.tiff \
 Images/ProjectCenter_dist.tiff \
diff --git a/Images/Editor.tiff b/Images/Editor.tiff
deleted file mode 100644
index c21222e..0000000
Binary files a/Images/Editor.tiff and /dev/null differ
diff --git a/Library/PCButton.m b/Library/PCButton.m
index 0a3adc4..ee549e0 100644
--- a/Library/PCButton.m
+++ b/Library/PCButton.m
@@ -207,11 +207,10 @@
 
 - (void)mouseEntered:(NSEvent *)theEvent
 {
-  NSLog (@"mouseEntered");
+//  NSLog (@"mouseEntered");
 
   if (ttTimer == nil)
     {
-//      NSLog (@"mouseEntered: setTimer: %@", data);
       ttTimer = [NSTimer scheduledTimerWithTimeInterval:0.5
 	                                         target:self
 			                       selector:@selector(_showTooltip:)
diff --git a/Library/PCProjectInspector.m b/Library/PCProjectInspector.m
index 4862145..cca5e35 100644
--- a/Library/PCProjectInspector.m
+++ b/Library/PCProjectInspector.m
@@ -306,6 +306,11 @@
 // ==== Notifications
 // ============================================================================
 
+- (void)controlTextDidEndEditing:(NSNotification *)aNotification
+{
+  [self changeCommonProjectEntry:[aNotification object]];
+}
+
 - (void)activeProjectDidChange:(NSNotification *)aNotif
 {
   PCProject *rootProject = [projectManager rootActiveProject];
@@ -430,13 +435,6 @@
   // Buttons
   [self setSearchOrderButtonsState];
 
-  [cppOptField setNextText:objcOptField];
-  [objcOptField setNextText:cOptField];
-  [cOptField setNextText:ldOptField];
-  [ldOptField setNextText:installPathField];
-  [installPathField setNextText:toolField];
-  [toolField setNextText:cppOptField];
-  
   // Retain view
   [buildAttributesView retain];
 }
@@ -594,13 +592,7 @@
   [authorDown setRefusesFirstResponder:YES];
   [authorDown setImage: [NSImage imageNamed:@"common_ArrowDown"]];
 
-  // Link textfields
-  [descriptionField setNextText:releaseField];
-  [releaseField setNextText:licenseField];
-  [licenseField setNextText:licDescriptionField];
-  [licDescriptionField setNextText:urlField];
-  [urlField setNextText:descriptionField];
-
+  // Retain view
   [projectDescriptionView retain];
 }
 
diff --git a/Library/PCProjectWindow.h b/Library/PCProjectWindow.h
index 47c0c03..41a8656 100644
--- a/Library/PCProjectWindow.h
+++ b/Library/PCProjectWindow.h
@@ -42,7 +42,7 @@
   NSBox       *toolbarView;
   PCButton    *buildButton;
   PCButton    *launchButton;
-  PCButton    *editorButton;
+  PCButton    *loadedFilesButton;
   PCButton    *findButton;
   PCButton    *inspectorButton;
 
diff --git a/Library/PCProjectWindow.m b/Library/PCProjectWindow.m
index 2034807..354244c 100644
--- a/Library/PCProjectWindow.m
+++ b/Library/PCProjectWindow.m
@@ -125,16 +125,27 @@
   [toolbarView addSubview: launchButton];
   RELEASE (launchButton);
   
-  editorButton = [[PCButton alloc] initWithFrame: NSMakeRect(88,5,43,43)];
-  [editorButton setRefusesFirstResponder:YES];
-  [editorButton setToolTip: @"Editor"];
-  [editorButton setImage: IMAGE(@"Editor")];
-  [editorButton setTarget: self];
-  [editorButton setAction: @selector(showProjectEditor:)];
-  [editorButton setAutoresizingMask: (NSViewMaxXMargin | NSViewMinYMargin)];
-  [editorButton setButtonType: NSMomentaryPushButton];
-  [toolbarView addSubview: editorButton];
-  RELEASE (editorButton);
+  if (![project isExecutable])
+    {
+      [launchButton setEnabled:NO];
+    }
+  
+  loadedFilesButton = [[PCButton alloc] initWithFrame: NSMakeRect(88,5,43,43)];
+  [loadedFilesButton setRefusesFirstResponder:YES];
+  [loadedFilesButton setToolTip: @"Loaded Files"];
+  [loadedFilesButton setImage: IMAGE(@"Files")];
+  [loadedFilesButton setTarget: self];
+  [loadedFilesButton setAction: @selector(showProjectLoadedFiles:)];
+  [loadedFilesButton 
+    setAutoresizingMask: (NSViewMaxXMargin | NSViewMinYMargin)];
+  [loadedFilesButton setButtonType: NSMomentaryPushButton];
+  [toolbarView addSubview: loadedFilesButton];
+  RELEASE (loadedFilesButton);
+  
+  if ([self hasLoadedFilesView])
+    {
+      [loadedFilesButton setEnabled:NO];
+    }
 
   findButton = [[PCButton alloc] initWithFrame: NSMakeRect(132,5,43,43)];
   [findButton setRefusesFirstResponder:YES];
@@ -810,13 +821,21 @@
     }
 
   // Loaded Files view
-  if ([self hasLoadedFilesView] && [[v_split subviews] count] == 1)
+  if ([self hasLoadedFilesView])
     {
-      [self showProjectLoadedFiles:self];
+      if ([[v_split subviews] count] == 1)
+	{
+	  [self showProjectLoadedFiles:self];
+	}
+      [loadedFilesButton setEnabled:NO];
     }
-  else if (![self hasLoadedFilesView] && [[v_split subviews] count] == 2)
+  else 
     {
-      [self showProjectLoadedFiles:self];
+      if ([[v_split subviews] count] == 2)
+	{
+	  [self showProjectLoadedFiles:self];
+	}
+      [loadedFilesButton setEnabled:YES];
     }
 }
 
diff --git a/Library/Resources/BuildAttributes.gorm/objects.gorm b/Library/Resources/BuildAttributes.gorm/objects.gorm
index 299d322..82a7d1b 100644
Binary files a/Library/Resources/BuildAttributes.gorm/objects.gorm and b/Library/Resources/BuildAttributes.gorm/objects.gorm differ
diff --git a/Library/Resources/ProjectDescription.gorm/objects.gorm b/Library/Resources/ProjectDescription.gorm/objects.gorm
index 949e65c..971bb73 100644
Binary files a/Library/Resources/ProjectDescription.gorm/objects.gorm and b/Library/Resources/ProjectDescription.gorm/objects.gorm differ
diff --git a/Resources/Preferences.gorm/objects.gorm b/Resources/Preferences.gorm/objects.gorm
index 243953d..d6cf087 100644
Binary files a/Resources/Preferences.gorm/objects.gorm and b/Resources/Preferences.gorm/objects.gorm differ