diff --git a/pcbnew/dialogs/dialog_imported_layers.cpp b/pcbnew/dialogs/dialog_imported_layers.cpp
index 6d6f04aec0..8f40fe97f9 100644
--- a/pcbnew/dialogs/dialog_imported_layers.cpp
+++ b/pcbnew/dialogs/dialog_imported_layers.cpp
@@ -29,9 +29,8 @@ PCB_LAYER_ID DIALOG_IMPORTED_LAYERS::GetSelectedLayerID()
     wxString selectedKiCadLayerName;
     long     itemIndex = -1;
 
-    if( ( itemIndex = m_kicad_layers_list->GetNextItem(
-                  itemIndex, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ) )
-            != wxNOT_FOUND )
+    if( ( itemIndex = m_kicad_layers_list->GetNextItem( itemIndex, wxLIST_NEXT_ALL,
+                                                        wxLIST_STATE_SELECTED ) ) != wxNOT_FOUND )
     {
         selectedKiCadLayerName = m_kicad_layers_list->GetItemText( itemIndex );
     }
@@ -41,10 +40,9 @@ PCB_LAYER_ID DIALOG_IMPORTED_LAYERS::GetSelectedLayerID()
     }
 
     // There should only be one selected (or none) as the list is set with wxLC_SINGLE_SEL style
-    wxASSERT_MSG( ( m_kicad_layers_list->GetNextItem(
-                          itemIndex, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ) )
-                          == wxNOT_FOUND,
-            "There are more than one KiCad layer selected (unexpected)" );
+    wxASSERT_MSG( ( m_kicad_layers_list->GetNextItem( itemIndex, wxLIST_NEXT_ALL,
+                                                      wxLIST_STATE_SELECTED ) ) == wxNOT_FOUND,
+                  "There are more than one KiCad layer selected (unexpected)" );
 
     for( LAYER_NUM layer = 0; layer < PCB_LAYER_ID_COUNT; ++layer )
     {
@@ -79,8 +77,8 @@ void DIALOG_IMPORTED_LAYERS::AddMappings()
     int        itemIndex = -1;
     wxArrayInt rowsToDelete;
 
-    while( ( itemIndex = m_unmatched_layers_list->GetNextItem(
-                     itemIndex, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ) )
+    while( ( itemIndex = m_unmatched_layers_list->GetNextItem( itemIndex, wxLIST_NEXT_ALL,
+                                                               wxLIST_STATE_SELECTED ) )
             != wxNOT_FOUND )
     {
         wxString selectedLayerName = m_unmatched_layers_list->GetItemText( itemIndex );
@@ -150,8 +148,8 @@ void DIALOG_IMPORTED_LAYERS::OnAutoMatchLayersClicked( wxCommandEvent& event )
     int        itemIndex = -1;
     wxArrayInt rowsToDelete;
 
-    while( ( itemIndex = m_unmatched_layers_list->GetNextItem(
-                     itemIndex, wxLIST_NEXT_ALL, wxLIST_STATE_DONTCARE ) )
+    while( ( itemIndex = m_unmatched_layers_list->GetNextItem( itemIndex, wxLIST_NEXT_ALL,
+                                                               wxLIST_STATE_DONTCARE ) )
             != wxNOT_FOUND )
     {
         wxString     layerName      = m_unmatched_layers_list->GetItemText( itemIndex );
@@ -187,8 +185,8 @@ void DIALOG_IMPORTED_LAYERS::OnAutoMatchLayersClicked( wxCommandEvent& event )
 
 
 DIALOG_IMPORTED_LAYERS::DIALOG_IMPORTED_LAYERS( wxWindow* aParent,
-                                                const std::vector<INPUT_LAYER_DESC>& aLayerDesc )
-                                                : DIALOG_IMPORTED_LAYERS_BASE( aParent )
+                                                const std::vector<INPUT_LAYER_DESC>& aLayerDesc ) :
+        DIALOG_IMPORTED_LAYERS_BASE( aParent )
 {
     LSET kiCadLayers;
 
@@ -200,25 +198,32 @@ DIALOG_IMPORTED_LAYERS::DIALOG_IMPORTED_LAYERS( wxWindow* aParent,
         kiCadLayers |= inLayer.PermittedLayers;
     }
 
+    int maxTextWidth = 0;
+
+    for( const INPUT_LAYER_DESC& layer : m_input_layers )
+        maxTextWidth = std::max( maxTextWidth, GetTextExtent( layer.Name ).x );
 
     // Initialize columns in the wxListCtrl elements:
     wxListItem importedLayersHeader;
     importedLayersHeader.SetId( 0 );
     importedLayersHeader.SetText( _( "Imported Layer" ) );
-    importedLayersHeader.SetWidth( 200 );
+    importedLayersHeader.SetWidth( maxTextWidth + 15 );
     m_unmatched_layers_list->InsertColumn( 0, importedLayersHeader );
 
+    int kicadMaxTextWidth = GetTextExtent( wxT( "User.Drawings" ) ).x;
+
     wxListItem kicadLayersHeader;
     kicadLayersHeader.SetId( 0 );
     kicadLayersHeader.SetText( _( "KiCad Layer" ) );
-    kicadLayersHeader.SetWidth( 100 );
+    kicadLayersHeader.SetWidth( kicadMaxTextWidth + 5 );
     m_kicad_layers_list->InsertColumn( 0, kicadLayersHeader );
 
     kicadLayersHeader.SetId( 1 );
+    importedLayersHeader.SetWidth( maxTextWidth + 15 );
+    kicadLayersHeader.SetWidth( kicadMaxTextWidth + 5 );
     m_matched_layers_list->InsertColumn( 0, importedLayersHeader );
     m_matched_layers_list->InsertColumn( 1, kicadLayersHeader );
 
-
     // Load the input layer list to unmatched layers
     int row = 0;
 
@@ -248,6 +253,7 @@ DIALOG_IMPORTED_LAYERS::DIALOG_IMPORTED_LAYERS( wxWindow* aParent,
 
     m_sdbSizerOK->SetDefault();
 
+    Fit();
     FinishDialogSettings();
 }
 
@@ -266,7 +272,7 @@ LAYER_MAP DIALOG_IMPORTED_LAYERS::GetMapModal( wxWindow* aParent,
         {
             wxMessageBox( _( "All layers must be matched. Please click on 'Auto-Matched Layers' "
                              "to automatically match the remaining layers." ),
-                    _( "Unmatched Layers" ), wxICON_ERROR | wxOK );
+                          _( "Unmatched Layers" ), wxICON_ERROR | wxOK );
         }
         else
         {
diff --git a/pcbnew/dialogs/dialog_imported_layers_base.cpp b/pcbnew/dialogs/dialog_imported_layers_base.cpp
index cff6ae9ca9..9d9a8c1cf3 100644
--- a/pcbnew/dialogs/dialog_imported_layers_base.cpp
+++ b/pcbnew/dialogs/dialog_imported_layers_base.cpp
@@ -11,7 +11,7 @@
 
 DIALOG_IMPORTED_LAYERS_BASE::DIALOG_IMPORTED_LAYERS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxSize( 600,350 ), wxDefaultSize );
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
 
 	bSizerMain = new wxBoxSizer( wxVERTICAL );
 
@@ -21,69 +21,67 @@ DIALOG_IMPORTED_LAYERS_BASE::DIALOG_IMPORTED_LAYERS_BASE( wxWindow* parent, wxWi
 	wxStaticBoxSizer* sbSizer1;
 	sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Unmatched Layers") ), wxHORIZONTAL );
 
-	wxBoxSizer* bSizerUnmatched;
-	bSizerUnmatched = new wxBoxSizer( wxVERTICAL );
+	wxFlexGridSizer* fgSizer1;
+	fgSizer1 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer1->AddGrowableCol( 0 );
+	fgSizer1->AddGrowableCol( 1 );
+	fgSizer1->AddGrowableRow( 1 );
+	fgSizer1->SetFlexibleDirection( wxVERTICAL );
+	fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-	m_staticText1 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("Imported Layers"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1->Wrap( -1 );
-	bSizerUnmatched->Add( m_staticText1, 0, wxALL, 5 );
+	m_lblImportedLayers = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("Imported Layers"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_lblImportedLayers->Wrap( -1 );
+	fgSizer1->Add( m_lblImportedLayers, 0, wxALL, 5 );
 
-	m_unmatched_layers_list = new wxListCtrl( sbSizer1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( 200,-1 ), wxLC_NO_HEADER|wxLC_REPORT );
-	m_unmatched_layers_list->SetMaxSize( wxSize( 300,-1 ) );
+	m_lblKicadLayers = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("KiCad Layers"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_lblKicadLayers->Wrap( -1 );
+	fgSizer1->Add( m_lblKicadLayers, 0, wxALL, 5 );
 
-	bSizerUnmatched->Add( m_unmatched_layers_list, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
+	m_unmatched_layers_list = new wxListCtrl( sbSizer1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxLC_NO_HEADER|wxLC_REPORT );
+	m_unmatched_layers_list->SetMinSize( wxSize( 120,-1 ) );
 
+	fgSizer1->Add( m_unmatched_layers_list, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
 
-	sbSizer1->Add( bSizerUnmatched, 1, wxEXPAND, 5 );
-
-	wxBoxSizer* bSizerKiCad;
-	bSizerKiCad = new wxBoxSizer( wxVERTICAL );
-
-	m_staticText2 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("KiCad Layers"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText2->Wrap( -1 );
-	bSizerKiCad->Add( m_staticText2, 0, wxALL, 5 );
-
-	m_kicad_layers_list = new wxListCtrl( sbSizer1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( 120,-1 ), wxLC_NO_HEADER|wxLC_REPORT|wxLC_SINGLE_SEL );
+	m_kicad_layers_list = new wxListCtrl( sbSizer1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxLC_NO_HEADER|wxLC_REPORT|wxLC_SINGLE_SEL );
 	m_kicad_layers_list->SetMinSize( wxSize( 120,-1 ) );
-	m_kicad_layers_list->SetMaxSize( wxSize( 150,-1 ) );
 
-	bSizerKiCad->Add( m_kicad_layers_list, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
+	fgSizer1->Add( m_kicad_layers_list, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
 
 
-	sbSizer1->Add( bSizerKiCad, 0, wxEXPAND, 5 );
+	sbSizer1->Add( fgSizer1, 1, wxEXPAND, 5 );
 
 
 	bSizerTop->Add( sbSizer1, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
 
-	wxStaticBoxSizer* sbSizer2;
-	sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
+	wxBoxSizer* bSizer6;
+	bSizer6 = new wxBoxSizer( wxVERTICAL );
 
-	m_button_add = new wxButton( sbSizer2->GetStaticBox(), wxID_ANY, _(">"), wxDefaultPosition, wxSize( 30,100 ), 0 );
+	m_button_add = new wxButton( this, wxID_ANY, _(">"), wxDefaultPosition, wxSize( 36,100 ), 0 );
 	m_button_add->SetFont( wxFont( 9, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
 	m_button_add->SetToolTip( _("Add selected layers to matched layers list.") );
 
-	sbSizer2->Add( m_button_add, 0, wxALL, 5 );
+	bSizer6->Add( m_button_add, 0, wxALL, 5 );
 
-	m_button_remove = new wxButton( sbSizer2->GetStaticBox(), wxID_ANY, _("<"), wxDefaultPosition, wxSize( 30,100 ), 0 );
+	m_button_remove = new wxButton( this, wxID_ANY, _("<"), wxDefaultPosition, wxSize( 36,100 ), 0 );
 	m_button_remove->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
 	m_button_remove->SetToolTip( _("Remove selected layers from matched layers list.") );
 
-	sbSizer2->Add( m_button_remove, 0, wxALL, 5 );
+	bSizer6->Add( m_button_remove, 0, wxALL, 5 );
 
-	m_button_removeall = new wxButton( sbSizer2->GetStaticBox(), wxID_ANY, _("<<"), wxDefaultPosition, wxSize( 30,50 ), 0 );
+	m_button_removeall = new wxButton( this, wxID_ANY, _("<<"), wxDefaultPosition, wxSize( 36,50 ), 0 );
 	m_button_removeall->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
 	m_button_removeall->SetToolTip( _("Remove all matched layers.") );
 
-	sbSizer2->Add( m_button_removeall, 0, wxALL, 5 );
+	bSizer6->Add( m_button_removeall, 0, wxALL, 5 );
 
 
-	bSizerTop->Add( sbSizer2, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 );
+	bSizerTop->Add( bSizer6, 0, wxEXPAND|wxTOP, 10 );
 
 	wxStaticBoxSizer* sbSizer3;
 	sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Matched Layers") ), wxHORIZONTAL );
 
-	m_matched_layers_list = new wxListCtrl( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( 300,-1 ), wxLC_REPORT );
-	m_matched_layers_list->SetMaxSize( wxSize( 500,-1 ) );
+	m_matched_layers_list = new wxListCtrl( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxLC_REPORT );
+	m_matched_layers_list->SetMinSize( wxSize( 120,-1 ) );
 
 	sbSizer3->Add( m_matched_layers_list, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
 
@@ -106,14 +104,15 @@ DIALOG_IMPORTED_LAYERS_BASE::DIALOG_IMPORTED_LAYERS_BASE( wxWindow* parent, wxWi
 	m_sdbSizer->AddButton( m_sdbSizerOK );
 	m_sdbSizer->Realize();
 
-	bSizerBottom->Add( m_sdbSizer, 1, wxALL|wxEXPAND, 5 );
+	bSizerBottom->Add( m_sdbSizer, 1, wxEXPAND, 5 );
 
 
-	bSizerMain->Add( bSizerBottom, 0, wxEXPAND|wxLEFT, 5 );
+	bSizerMain->Add( bSizerBottom, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxTOP, 5 );
 
 
 	this->SetSizer( bSizerMain );
 	this->Layout();
+	bSizerMain->Fit( this );
 
 	// Connect Events
 	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_IMPORTED_LAYERS_BASE::OnClose ) );
diff --git a/pcbnew/dialogs/dialog_imported_layers_base.fbp b/pcbnew/dialogs/dialog_imported_layers_base.fbp
index 8389875b06..07c64e5f3d 100644
--- a/pcbnew/dialogs/dialog_imported_layers_base.fbp
+++ b/pcbnew/dialogs/dialog_imported_layers_base.fbp
@@ -42,10 +42,10 @@
             <property name="hidden">0</property>
             <property name="id">wxID_ANY</property>
             <property name="maximum_size"></property>
-            <property name="minimum_size">600,350</property>
+            <property name="minimum_size">-1,-1</property>
             <property name="name">DIALOG_IMPORTED_LAYERS_BASE</property>
             <property name="pos"></property>
-            <property name="size">795,476</property>
+            <property name="size">-1,-1</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
             <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
             <property name="title">Edit Mapping of Imported Layers</property>
@@ -85,16 +85,23 @@
                                     <property name="border">5</property>
                                     <property name="flag">wxEXPAND</property>
                                     <property name="proportion">1</property>
-                                    <object class="wxBoxSizer" expanded="1">
+                                    <object class="wxFlexGridSizer" expanded="1">
+                                        <property name="cols">2</property>
+                                        <property name="flexible_direction">wxVERTICAL</property>
+                                        <property name="growablecols">0,1</property>
+                                        <property name="growablerows">1</property>
+                                        <property name="hgap">0</property>
                                         <property name="minimum_size"></property>
-                                        <property name="name">bSizerUnmatched</property>
-                                        <property name="orient">wxVERTICAL</property>
+                                        <property name="name">fgSizer1</property>
+                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
                                         <property name="permission">none</property>
-                                        <object class="sizeritem" expanded="1">
+                                        <property name="rows">0</property>
+                                        <property name="vgap">0</property>
+                                        <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
                                             <property name="flag">wxALL</property>
                                             <property name="proportion">0</property>
-                                            <object class="wxStaticText" expanded="1">
+                                            <object class="wxStaticText" expanded="0">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
@@ -131,7 +138,7 @@
                                                 <property name="minimize_button">0</property>
                                                 <property name="minimum_size"></property>
                                                 <property name="moveable">1</property>
-                                                <property name="name">m_staticText1</property>
+                                                <property name="name">m_lblImportedLayers</property>
                                                 <property name="pane_border">1</property>
                                                 <property name="pane_position"></property>
                                                 <property name="pane_size"></property>
@@ -151,11 +158,11 @@
                                                 <property name="wrap">-1</property>
                                             </object>
                                         </object>
-                                        <object class="sizeritem" expanded="1">
+                                        <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
-                                            <property name="flag">wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT</property>
-                                            <property name="proportion">1</property>
-                                            <object class="wxListCtrl" expanded="1">
+                                            <property name="flag">wxALL</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxStaticText" expanded="0">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
@@ -183,14 +190,16 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
+                                                <property name="label">KiCad Layers</property>
+                                                <property name="markup">0</property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
-                                                <property name="maximum_size">300,-1</property>
+                                                <property name="maximum_size">-1,-1</property>
                                                 <property name="min_size"></property>
                                                 <property name="minimize_button">0</property>
                                                 <property name="minimum_size"></property>
                                                 <property name="moveable">1</property>
-                                                <property name="name">m_unmatched_layers_list</property>
+                                                <property name="name">m_lblKicadLayers</property>
                                                 <property name="pane_border">1</property>
                                                 <property name="pane_position"></property>
                                                 <property name="pane_size"></property>
@@ -199,37 +208,22 @@
                                                 <property name="pos"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
-                                                <property name="size">200,-1</property>
-                                                <property name="style">wxLC_NO_HEADER|wxLC_REPORT</property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
                                                 <property name="subclass">; ; forward_declare</property>
                                                 <property name="toolbar_pane">0</property>
                                                 <property name="tooltip"></property>
-                                                <property name="validator_data_type"></property>
-                                                <property name="validator_style">wxFILTER_NONE</property>
-                                                <property name="validator_type">wxDefaultValidator</property>
-                                                <property name="validator_variable"></property>
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
-                                                <event name="OnListItemActivated">OnUnMatchedDoubleClick</event>
+                                                <property name="wrap">-1</property>
                                             </object>
                                         </object>
-                                    </object>
-                                </object>
-                                <object class="sizeritem" expanded="1">
-                                    <property name="border">5</property>
-                                    <property name="flag">wxEXPAND</property>
-                                    <property name="proportion">0</property>
-                                    <object class="wxBoxSizer" expanded="1">
-                                        <property name="minimum_size"></property>
-                                        <property name="name">bSizerKiCad</property>
-                                        <property name="orient">wxVERTICAL</property>
-                                        <property name="permission">none</property>
-                                        <object class="sizeritem" expanded="1">
+                                        <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
-                                            <property name="flag">wxALL</property>
-                                            <property name="proportion">0</property>
-                                            <object class="wxStaticText" expanded="1">
+                                            <property name="flag">wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT</property>
+                                            <property name="proportion">1</property>
+                                            <object class="wxListCtrl" expanded="0">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
@@ -257,16 +251,14 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="label">KiCad Layers</property>
-                                                <property name="markup">0</property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size">-1,-1</property>
                                                 <property name="min_size"></property>
                                                 <property name="minimize_button">0</property>
-                                                <property name="minimum_size"></property>
+                                                <property name="minimum_size">120,-1</property>
                                                 <property name="moveable">1</property>
-                                                <property name="name">m_staticText2</property>
+                                                <property name="name">m_unmatched_layers_list</property>
                                                 <property name="pane_border">1</property>
                                                 <property name="pane_position"></property>
                                                 <property name="pane_size"></property>
@@ -275,22 +267,26 @@
                                                 <property name="pos"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style"></property>
+                                                <property name="size">-1,-1</property>
+                                                <property name="style">wxLC_NO_HEADER|wxLC_REPORT</property>
                                                 <property name="subclass">; ; forward_declare</property>
                                                 <property name="toolbar_pane">0</property>
                                                 <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
-                                                <property name="wrap">-1</property>
+                                                <event name="OnListItemActivated">OnUnMatchedDoubleClick</event>
                                             </object>
                                         </object>
-                                        <object class="sizeritem" expanded="1">
+                                        <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
                                             <property name="flag">wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT</property>
                                             <property name="proportion">1</property>
-                                            <object class="wxListCtrl" expanded="1">
+                                            <object class="wxListCtrl" expanded="0">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
@@ -320,7 +316,7 @@
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
-                                                <property name="maximum_size">150,-1</property>
+                                                <property name="maximum_size">-1,-1</property>
                                                 <property name="min_size"></property>
                                                 <property name="minimize_button">0</property>
                                                 <property name="minimum_size">120,-1</property>
@@ -334,7 +330,7 @@
                                                 <property name="pos"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
-                                                <property name="size">120,-1</property>
+                                                <property name="size">-1,-1</property>
                                                 <property name="style">wxLC_NO_HEADER|wxLC_REPORT|wxLC_SINGLE_SEL</property>
                                                 <property name="subclass">; ; forward_declare</property>
                                                 <property name="toolbar_pane">0</property>
@@ -354,16 +350,13 @@
                             </object>
                         </object>
                         <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxEXPAND|wxLEFT|wxRIGHT|wxTOP</property>
+                            <property name="border">10</property>
+                            <property name="flag">wxEXPAND|wxTOP</property>
                             <property name="proportion">0</property>
-                            <object class="wxStaticBoxSizer" expanded="1">
-                                <property name="id">wxID_ANY</property>
-                                <property name="label"></property>
+                            <object class="wxBoxSizer" expanded="1">
                                 <property name="minimum_size"></property>
-                                <property name="name">sbSizer2</property>
+                                <property name="name">bSizer6</property>
                                 <property name="orient">wxVERTICAL</property>
-                                <property name="parent">1</property>
                                 <property name="permission">none</property>
                                 <object class="sizeritem" expanded="1">
                                     <property name="border">5</property>
@@ -423,7 +416,7 @@
                                         <property name="pressed"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size">30,100</property>
+                                        <property name="size">36,100</property>
                                         <property name="style"></property>
                                         <property name="subclass">; ; forward_declare</property>
                                         <property name="toolbar_pane">0</property>
@@ -496,7 +489,7 @@
                                         <property name="pressed"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size">30,100</property>
+                                        <property name="size">36,100</property>
                                         <property name="style"></property>
                                         <property name="subclass">; ; forward_declare</property>
                                         <property name="toolbar_pane">0</property>
@@ -569,7 +562,7 @@
                                         <property name="pressed"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size">30,50</property>
+                                        <property name="size">36,50</property>
                                         <property name="style"></property>
                                         <property name="subclass">; ; forward_declare</property>
                                         <property name="toolbar_pane">0</property>
@@ -632,10 +625,10 @@
                                         <property name="id">wxID_ANY</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size">500,-1</property>
+                                        <property name="maximum_size">-1,-1</property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size"></property>
+                                        <property name="minimum_size">120,-1</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_matched_layers_list</property>
                                         <property name="pane_border">1</property>
@@ -646,7 +639,7 @@
                                         <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size">300,-1</property>
+                                        <property name="size">-1,-1</property>
                                         <property name="style">wxLC_REPORT</property>
                                         <property name="subclass">; ; forward_declare</property>
                                         <property name="toolbar_pane">0</property>
@@ -667,7 +660,7 @@
                 </object>
                 <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
-                    <property name="flag">wxEXPAND|wxLEFT</property>
+                    <property name="flag">wxBOTTOM|wxEXPAND|wxLEFT|wxTOP</property>
                     <property name="proportion">0</property>
                     <object class="wxBoxSizer" expanded="1">
                         <property name="minimum_size"></property>
@@ -749,7 +742,7 @@
                         </object>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxALL|wxEXPAND</property>
+                            <property name="flag">wxEXPAND</property>
                             <property name="proportion">1</property>
                             <object class="wxStdDialogButtonSizer" expanded="1">
                                 <property name="Apply">0</property>
diff --git a/pcbnew/dialogs/dialog_imported_layers_base.h b/pcbnew/dialogs/dialog_imported_layers_base.h
index 3f05afddf7..6d02d38de3 100644
--- a/pcbnew/dialogs/dialog_imported_layers_base.h
+++ b/pcbnew/dialogs/dialog_imported_layers_base.h
@@ -37,9 +37,9 @@ class DIALOG_IMPORTED_LAYERS_BASE : public DIALOG_SHIM
 
 	protected:
 		wxBoxSizer* bSizerMain;
-		wxStaticText* m_staticText1;
+		wxStaticText* m_lblImportedLayers;
+		wxStaticText* m_lblKicadLayers;
 		wxListCtrl* m_unmatched_layers_list;
-		wxStaticText* m_staticText2;
 		wxListCtrl* m_kicad_layers_list;
 		wxButton* m_button_add;
 		wxButton* m_button_remove;
@@ -62,7 +62,7 @@ class DIALOG_IMPORTED_LAYERS_BASE : public DIALOG_SHIM
 
 	public:
 
-		DIALOG_IMPORTED_LAYERS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Edit Mapping of Imported Layers"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 795,476 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+		DIALOG_IMPORTED_LAYERS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Edit Mapping of Imported Layers"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 		~DIALOG_IMPORTED_LAYERS_BASE();
 
 };
diff --git a/pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp b/pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp
index dac6b9db36..35f8836d65 100644
--- a/pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp
+++ b/pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp
@@ -697,7 +697,7 @@ void CADSTAR_PCB_ARCHIVE_LOADER::loadLibraryPads( const SYMDEF_PCB& aComponent,
             wxASSERT_MSG( true, "Unknown Pad type" );
         }
 
-        pad->SetName( csPad.Identifier.IsEmpty() ? wxString::Format( wxT( "%i" ), csPad.ID ) :
+        pad->SetName( csPad.Identifier.IsEmpty() ? wxString::Format( wxT( "%ld" ), csPad.ID ) :
                                                    csPad.Identifier );
 
         pad->SetPos0( getKiCadPoint( csPad.Position ) - aModule->GetPosition() );
@@ -2486,7 +2486,7 @@ NETINFO_ITEM* CADSTAR_PCB_ARCHIVE_LOADER::getKiCadNet( const NET_ID& aCadstarNet
                 MODULE* m = getModuleFromCadstarID( firstPin.ComponentID );
                 newName   = wxT( "Net-(" );
                 newName << m->Reference().GetText();
-                newName << "-Pad" << wxString::Format( "%i", firstPin.PadID ) << ")";
+                newName << "-Pad" << wxString::Format( "%ld", firstPin.PadID ) << ")";
             }
             else
             {