diff --git a/gerbview/X2_gerber_attributes.cpp b/gerbview/X2_gerber_attributes.cpp
index e0c38a1e99..44e2589ac8 100644
--- a/gerbview/X2_gerber_attributes.cpp
+++ b/gerbview/X2_gerber_attributes.cpp
@@ -292,7 +292,15 @@ void X2_ATTRIBUTE_FILEFUNCTION::set_Z_Order()
         // Silk screen layer: the priority is top then bottom
         m_z_order = 3;       // for top
 
-        if( GetFileType().IsSameAs( wxT( "Legend" ), false ) )
+        if( GetBrdLayerId().IsSameAs( wxT( "Bot" ), false ) )
+            m_z_order = -m_z_order;
+    }
+
+    if( GetFileType().IsSameAs( wxT( "Glue" ), false ) )
+    {
+        // Glue spots used to fix components to the board prior to soldering:
+        // the priority is top then bottom
+        m_z_order = 4;       // for top
 
         if( GetBrdLayerId().IsSameAs( wxT( "Bot" ), false ) )
             m_z_order = -m_z_order;
diff --git a/kicad/prjconfig.cpp b/kicad/prjconfig.cpp
index 8103ffd7ce..675ceae5cd 100644
--- a/kicad/prjconfig.cpp
+++ b/kicad/prjconfig.cpp
@@ -196,7 +196,7 @@ public:
         m_cbCreateDir->SetValue( true );
 
         wxBoxSizer* sizer = new wxBoxSizer( wxHORIZONTAL );
-        sizer->Add( m_cbCreateDir );
+        sizer->Add( m_cbCreateDir, 0, wxALL, 8 );
 
         SetSizerAndFit( sizer );
     }