diff --git a/Documentation/wxWidgets_patch_notes.txt b/Documentation/wxWidgets_patch_notes.txt
index 2413eccdcd..9b825de84f 100644
--- a/Documentation/wxWidgets_patch_notes.txt
+++ b/Documentation/wxWidgets_patch_notes.txt
@@ -9,11 +9,12 @@ use *only* wxWidgets
 >= 3.0.2 on OSX (which need patches: see patches/wxwidgets-3.0.0_macosx_xxx)
 
 Known bug on Windows:
-Postscript printers print tracks like tin line.
+Postscript printers print tracks like thin line.
 It happens only for PS drivers, and PDF printer.
 Other drivers (PCL for instance) work fine,
 so it is unlikely a bug inside Kicad/wxWidgets
 
-on 3.0.2 Window version 64 bits:
-the mirror mode gives a blanc sheet.
+On 3.0.2 Window version 64 bits:
+The mirror mode gives a blank sheet.
+This is a bug in wxWidgets 3.0.2
 wxWidgets 3.0.2 must be patched (see patches/wxWidgets-3.0.2-msw-dc-orientation-fix.patch) and rebuilt.
diff --git a/pcbnew/menubar_modedit.cpp b/pcbnew/menubar_modedit.cpp
index 4140b9f895..4cb00c5a0b 100644
--- a/pcbnew/menubar_modedit.cpp
+++ b/pcbnew/menubar_modedit.cpp
@@ -183,6 +183,11 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
     // Dimensions submenu
     wxMenu* dimensions_Submenu = new wxMenu;
 
+    // User grid size
+    AddMenuItem( dimensions_Submenu, ID_PCB_USER_GRID_SETUP,
+                 _( "&User Grid Size" ), _( "Adjust user grid" ),
+                 KiBitmap( grid_xpm ) );
+
     // Sizes and Widths
     AddMenuItem( dimensions_Submenu, ID_PCB_DRAWINGS_WIDTHS_SETUP,
                  _( "&Size and Width" ),
@@ -194,11 +199,6 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
                  _( "&Pad Setting" ), _( "Edit settings for new pads" ),
                  KiBitmap( pad_dimensions_xpm ) );
 
-    // User grid size
-    AddMenuItem( dimensions_Submenu, ID_PCB_USER_GRID_SETUP,
-                 _( "&User Grid Size" ), _( "Adjust user grid" ),
-                 KiBitmap( grid_xpm ) );
-
     //--------- View menu ----------------
     wxMenu* viewMenu = new wxMenu;
 
diff --git a/pcbnew/moduleframe.cpp b/pcbnew/moduleframe.cpp
index 9aa87c171b..38f2b73b9f 100644
--- a/pcbnew/moduleframe.cpp
+++ b/pcbnew/moduleframe.cpp
@@ -470,12 +470,14 @@ void FOOTPRINT_EDIT_FRAME::SetPlotSettings( const PCB_PLOT_PARAMS& aSettings )
 
 void FOOTPRINT_EDIT_FRAME::LoadSettings( wxConfigBase* aCfg )
 {
-    EDA_DRAW_FRAME::LoadSettings( aCfg );
+    PCB_BASE_FRAME::LoadSettings( aCfg );
     wxConfigLoadSetups( aCfg, GetConfigurationSettings() );
 
     // Ensure some params are valid
     BOARD_DESIGN_SETTINGS& settings = GetDesignSettings();
 
+    // Usually, graphic items are drawn on F_SilkS or F_Fab layer
+    // Force these layers if not default
     if( ( settings.m_RefDefaultlayer != F_SilkS ) && ( settings.m_RefDefaultlayer != F_Fab ) )
         settings.m_RefDefaultlayer = F_SilkS;
 
@@ -486,7 +488,7 @@ void FOOTPRINT_EDIT_FRAME::LoadSettings( wxConfigBase* aCfg )
 
 void FOOTPRINT_EDIT_FRAME::SaveSettings( wxConfigBase* aCfg )
 {
-    EDA_DRAW_FRAME::SaveSettings( aCfg );
+    PCB_BASE_FRAME::SaveSettings( aCfg );
     wxConfigSaveSetups( aCfg, GetConfigurationSettings() );
 }