diff --git a/ide/keymapping.pp b/ide/keymapping.pp
index c14be4a170..ea5cad553b 100644
--- a/ide/keymapping.pp
+++ b/ide/keymapping.pp
@@ -195,8 +195,9 @@ const
   
   // components menu
   ecConfigCustomComps    = ecUserFirst + 900;
-  ecOpenInstalledPkg     = ecUserFirst + 901;
+  ecEditPackage          = ecUserFirst + 901;
   ecOpenPackageFile      = ecUserFirst + 902;
+  ecPackageGraph         = ecUserFirst + 903;
 
   // help menu
   ecAboutLazarus         = ecUserFirst + 1000;
@@ -628,8 +629,9 @@ begin
     
     // components menu
     ecConfigCustomComps     : Result:= lisMenuConfigCustomComps;
-    ecOpenInstalledPkg      : Result:= lisMenuOpenInstalledPkg;
+    ecEditPackage           : Result:= lisMenuEditPackage;
     ecOpenPackageFile       : Result:= lisMenuOpenPackageFile;
+    ecPackageGraph          : Result:= lisMenuPackageGraph;
 
     // tools menu
     ecExtToolSettings       : Result:= srkmecExtToolSettings;
@@ -1465,8 +1467,9 @@ begin
   // components menu
   C:=Categories[AddCategory('Components',srkmCatComponentsMenu,caAll)];
   Add(C,'Configure custom components',ecConfigCustomComps,VK_UNKNOWN,[],VK_UNKNOWN,[]);
-  Add(C,'Open installed package',ecOpenInstalledPkg,VK_UNKNOWN,[],VK_UNKNOWN,[]);
+  Add(C,'Edit package',ecEditPackage,VK_UNKNOWN,[],VK_UNKNOWN,[]);
   Add(C,'Open package file',ecOpenPackageFile,VK_UNKNOWN,[],VK_UNKNOWN,[]);
+  Add(C,'Package graph',ecPackageGraph,VK_UNKNOWN,[],VK_UNKNOWN,[]);
 
   // tools menu
   C:=Categories[AddCategory(KeyCategoryToolMenuName,srkmCatToolMenu,caAll)];
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 40e5dc57d8..4827ccd6ae 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -206,9 +206,10 @@ resourcestring
   lisMenuRunParameters = 'Run Parameters ...';
   
   lisMenuConfigCustomComps = 'Configure custom components';
-  lisMenuOpenInstalledPkg = 'Open installed package';
+  lisMenuEditPackage = 'Edit package';
   lisMenuOpenRecentPkg = 'Open recent package';
   lisMenuOpenPackageFile = 'Open package file';
+  lisMenuPackageGraph = 'Package Graph';
 
   lisMenuSettings = 'Configure custom tools ...';
   lisMenuQuickSyntaxCheck = 'Quick syntax check';
@@ -456,7 +457,7 @@ resourcestring
   dlgScrollByOneLess = 'Scroll By One Less';
   dlgScrollPastEndFile = 'Scroll Past End of File';
   dlgScrollPastEndLine = 'Scroll Past End of Line';
-  dlgCloseButtonsNotebook = 'Close buttons in notebook';
+  dlgCloseButtonsNotebook = 'Show Close Buttons in notebook';
   dlgShowScrollHint = 'Show Scroll Hint';
   dlgMouseLinks = 'Mouse links';
   dlgSmartTabs = 'Smart Tabs';
diff --git a/ide/mainbar.pas b/ide/mainbar.pas
index 96ed733d12..b29f381d6a 100644
--- a/ide/mainbar.pas
+++ b/ide/mainbar.pas
@@ -281,9 +281,10 @@ type
     
     // components menu
     itmCompsConfigCustomComps: TMenuItem;
-    itmPkgOpenInstalled: TMenuItem;
+    itmPkgEditPackage: TMenuItem;
     itmPkgOpenPackageFile: TMenuItem;
     itmPkgOpenRecent: TMenuItem;
+    itmPkgPkgGraph: TMenuItem;
 
     // tools menu
     itmToolConfigure: TMenuItem;
@@ -863,6 +864,7 @@ begin
   itmViewCodeExplorer := TMenuItem.Create(Self);
   itmViewCodeExplorer.Name:='itmViewCodeExplorer';
   itmViewCodeExplorer.Caption := lisMenuViewCodeExplorer;
+  itmViewCodeExplorer.Enabled := false;
   mnuView.Add(itmViewCodeExplorer);
 
   mnuView.Add(CreateMenuSeparator);
@@ -1082,11 +1084,11 @@ begin
   mnuComponents.Add(CreateMenuSeparator);
   {$ENDIF}
 
-  itmPkgOpenInstalled := TMenuItem.Create(Self);
-  itmPkgOpenInstalled.Name:='itmPkgOpenInstalled';
-  itmPkgOpenInstalled.Caption := lisMenuOpenInstalledPkg;
+  itmPkgEditPackage := TMenuItem.Create(Self);
+  itmPkgEditPackage.Name:='itmPkgEditPackage';
+  itmPkgEditPackage.Caption := lisMenuEditPackage;
   {$IFDEF EnablePkgs}
-  mnuComponents.Add(itmPkgOpenInstalled);
+  mnuComponents.Add(itmPkgEditPackage);
   {$ENDIF}
 
   itmPkgOpenPackageFile := TMenuItem.Create(Self);
@@ -1102,6 +1104,17 @@ begin
   {$IFDEF EnablePkgs}
   mnuComponents.Add(itmPkgOpenRecent);
   {$ENDIF}
+
+  {$IFDEF EnablePkgs}
+  mnuComponents.Add(CreateMenuSeparator);
+  {$ENDIF}
+
+  itmPkgPkgGraph := TMenuItem.Create(Self);
+  itmPkgPkgGraph.Name:='itmPkgPkgGraph';
+  itmPkgPkgGraph.Caption := lisMenuPackageGraph;
+  {$IFDEF EnablePkgs}
+  mnuComponents.Add(itmPkgPkgGraph);
+  {$ENDIF}
 end;
 
 procedure TMainIDEBar.SetupToolsMenu;
@@ -1305,8 +1318,9 @@ begin
 
     // components menu
     itmCompsConfigCustomComps.ShortCut:=CommandToShortCut(ecConfigCustomComps);
-    itmPkgOpenInstalled.ShortCut:=CommandToShortCut(ecOpenInstalledPkg);
+    itmPkgEditPackage.ShortCut:=CommandToShortCut(ecEditPackage);
     itmPkgOpenPackageFile.ShortCut:=CommandToShortCut(ecOpenPackageFile);
+    itmPkgPkgGraph.ShortCut:=CommandToShortCut(ecPackageGraph);
 
     // tools menu
     itmToolConfigure.ShortCut:=CommandToShortCut(ecExtToolSettings);
diff --git a/packager/openinstalledpkgdlg.pas b/packager/openinstalledpkgdlg.pas
index f28d7167bb..6a594d898a 100644
--- a/packager/openinstalledpkgdlg.pas
+++ b/packager/openinstalledpkgdlg.pas
@@ -219,7 +219,7 @@ constructor TOpenInstalledPackagesDlg.Create(TheOwner: TComponent);
 begin
   inherited Create(TheOwner);
   Name:='OpenInstalledPackagesDlg';
-  Caption:='Open installed package';
+  Caption:='Open loaded package';
   SetupComponents;
   OnResize:=@OpenInstalledPackagesDlgResize;
   Position:=poScreenCenter;
diff --git a/packager/packagedefs.pas b/packager/packagedefs.pas
index de43de2c59..c9468fb720 100644
--- a/packager/packagedefs.pas
+++ b/packager/packagedefs.pas
@@ -1074,7 +1074,6 @@ begin
     FDirectory:=FFilename
   else
     FDirectory:=ExtractFilePath(FFilename);
-writeln('TLazPackage.SetFilename A "',FFilename,'" "',FDirectory,'" HasDirectory=',HasDirectory);
   Modified:=true;
 end;
 
diff --git a/packager/pkgmanager.pas b/packager/pkgmanager.pas
index 49a5cc9abb..c8dfb51268 100644
--- a/packager/pkgmanager.pas
+++ b/packager/pkgmanager.pas
@@ -54,6 +54,7 @@ uses
 type
   TPkgManager = class(TBasePkgManager)
     procedure MainIDEitmPkgOpenPackageFileClick(Sender: TObject);
+    procedure MainIDEitmPkgPkgGraphClick(Sender: TObject);
     function OnPackageEditorCreateFile(Sender: TObject;
       const Params: TAddToPkgResult): TModalResult;
     procedure OnPackageEditorGetUnitRegisterInfo(Sender: TObject;
@@ -63,7 +64,7 @@ type
       ): TModalResult;
     procedure OnPackageEditorSavePackage(Sender: TObject);
     procedure mnuConfigCustomCompsClicked(Sender: TObject);
-    procedure mnuOpenInstalledPckClicked(Sender: TObject);
+    procedure mnuPkgEditPackageClicked(Sender: TObject);
     procedure mnuOpenRecentPackageClicked(Sender: TObject);
   private
     function DoShowSavePackageAsDialog(APackage: TLazPackage): TModalResult;
@@ -88,6 +89,7 @@ type
                          Flags: TPkgOpenFlags): TModalResult; override;
     function DoSavePackage(APackage: TLazPackage;
                            Flags: TPkgSaveFlags): TModalResult; override;
+    function DoShowPackageGraph: TModalResult;
   end;
 
 implementation
@@ -122,6 +124,11 @@ begin
   end;
 end;
 
+procedure TPkgManager.MainIDEitmPkgPkgGraphClick(Sender: TObject);
+begin
+  DoShowPackageGraph;
+end;
+
 function TPkgManager.OnPackageEditorCreateFile(Sender: TObject;
   const Params: TAddToPkgResult): TModalResult;
 var
@@ -210,7 +217,7 @@ begin
   ShowConfigureCustomComponents;
 end;
 
-procedure TPkgManager.mnuOpenInstalledPckClicked(Sender: TObject);
+procedure TPkgManager.mnuPkgEditPackageClicked(Sender: TObject);
 begin
   DoShowOpenInstalledPckDlg;
 end;
@@ -430,8 +437,9 @@ procedure TPkgManager.ConnectMainBarEvents;
 begin
   with MainIDE do begin
     itmCompsConfigCustomComps.OnClick :=@mnuConfigCustomCompsClicked;
-    itmPkgOpenInstalled.OnClick :=@mnuOpenInstalledPckClicked;
+    itmPkgEditPackage.OnClick :=@mnuPkgEditPackageClicked;
     itmPkgOpenPackageFile.OnClick:=@MainIDEitmPkgOpenPackageFileClick;
+    itmPkgPkgGraph.OnClick:=@MainIDEitmPkgPkgGraphClick;
   end;
   
   SetRecentPackagesMenu;
@@ -661,5 +669,10 @@ begin
   Result:=mrOk;
 end;
 
+function TPkgManager.DoShowPackageGraph: TModalResult;
+begin
+  Result:=mrCancel;
+end;
+
 end.