diff --git a/app/src/gambas3/.project b/app/src/gambas3/.project
index 592906af3..821ac55ce 100644
--- a/app/src/gambas3/.project
+++ b/app/src/gambas3/.project
@@ -30,8 +30,8 @@ Component=gb.signal
 Component=gb.util
 Description="Integrated Development Environment for Gambas"
 Authors="Benoît Minisini\nFabien Bodard\nCharlie Reinl\nJosé Luis Redrejo\nRobert Rowe\nTobias Boege"
-Arguments=[["-t","/home/benoit/gambas/3.0/trunk/app/src/gambas3"]]
-CurrentArgument=0
+Arguments=[["~/AVT_Edith-Piaf_1740.jpeg"]]
+CurrentArgument=1
 TabSize=2
 Translate=1
 Language=en
diff --git a/app/src/gambas3/.src/FMain.class b/app/src/gambas3/.src/FMain.class
index 689a9edc1..87478b31a 100644
--- a/app/src/gambas3/.src/FMain.class
+++ b/app/src/gambas3/.src/FMain.class
@@ -1236,13 +1236,16 @@ Private Sub UpdateGlobalLayout()
   mnuSave.Visible = Not bWelcome
   mnuSaveAs.Visible = Not bWelcome
 
-  For Each hMenu In [mnuEdit, mnuProject, mnuDebug, mnuView]
+  For Each hMenu In [mnuProject, mnuDebug, mnuView]
     hMenu.Visible = Not bWelcome And Not bFake
     hMenu.Enabled = hMenu.Visible
   Next
   
+  mnuEdit.Visible = Not bWelcome
+  mnuEdit.Enabled = mnuEdit.Visible
+  
   mnuTool.Visible = Not bWelcome
-  For Each hMenu In [mnuBrowse, mnuTerminal, mnuSendMail, mnuUpdateAllForms]
+  For Each hMenu In [mnuBrowse, mnuTerminal, mnuSendMail, mnuUpdateAllForms, mnuTool]
     hMenu.Visible = Not bFake
     hMenu.Enabled = hMenu.Visible
   Next
diff --git a/app/src/gambas3/.src/FMain.form b/app/src/gambas3/.src/FMain.form
index d93c051ec..c31c307d9 100644
--- a/app/src/gambas3/.src/FMain.form
+++ b/app/src/gambas3/.src/FMain.form
@@ -81,7 +81,6 @@
       Action = "_save"
       Text = ("Save")
       Picture = Picture["icon:/small/save"]
-      Shortcut = "Ctrl+S"
     }
     { Menu40 Menu
       Action = ".save-as"
@@ -1272,7 +1271,7 @@
   }
   { Action _save
     Text = "Save"
-    Shortcut = "Ctrl+S"
+    Shortcut = ""
     Picture = "icon:/small/save"
   }
   { Action about