diff --git a/Utils/MapEdit/MainFrm.cpp b/Utils/MapEdit/MainFrm.cpp
index 69c4d3596..cf44ac1ed 100644
--- a/Utils/MapEdit/MainFrm.cpp
+++ b/Utils/MapEdit/MainFrm.cpp
@@ -66,6 +66,8 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 	m_wndParamBar.EnableDocking( CBRS_ALIGN_ANY);
 	m_wndParamBar.SetWindowText("Param");
 	DockControlBar(&m_wndParamBar);
+
+//	Test1.Create(IDD_TEST1,NULL);
 	m_wndParamBar.AddDialog(LayerList,IDD_LAYER_LIST_DIALOG,TRUE);
 	m_wndParamBar.AddDialog(Test1,IDD_TEST1,TRUE);
 	m_wndParamBar.AddDialog(Test2,IDD_TEST2,TRUE);
diff --git a/Utils/MapEdit/MainFrm.h b/Utils/MapEdit/MainFrm.h
index 944b64ad9..9cdb7f9df 100644
--- a/Utils/MapEdit/MainFrm.h
+++ b/Utils/MapEdit/MainFrm.h
@@ -6,6 +6,7 @@
 #define AFX_MAINFRM_H__CEC14D79_A1F2_4281_AA53_544F0924E7D8__INCLUDED_
 
 #include	"MultiBar.h"
+#include	"LayerList.h"
 
 #if _MSC_VER > 1000
 #pragma once
@@ -55,7 +56,7 @@ protected:  // control bar embedded members
 
 	CMultiBar		m_wndParamBar;
 // Sub Dialogs
-	CDialog			LayerList;
+	CLayerList		LayerList;
 	CDialog			Test1;
 	CDialog			Test2;
 
diff --git a/Utils/MapEdit/MapEdit.clw b/Utils/MapEdit/MapEdit.clw
index 76b2a2b4e..74707fab7 100644
--- a/Utils/MapEdit/MapEdit.clw
+++ b/Utils/MapEdit/MapEdit.clw
@@ -18,18 +18,18 @@ Class6=CMapEditDoc
 Class7=CMapEditView
 
 ResourceCount=10
-Resource1=IDR_TOOLBAR (English (U.S.))
+Resource1=IDD_TEST1
 Resource2=IDR_MAPEDITYPE (English (U.S.))
-Resource3=IDD_LAYER_LIST_DIALOG
+Resource3=IDD_ABOUTBOX (English (U.S.))
 Resource4=IDD_DIALOGBAR (English (U.S.))
-Resource5=IDD_TEST1
-Class8=CLayerList
-Resource6=IDR_MAINFRAME (English (U.S.))
-Resource7=IDD_TRASHHEAP
-Class9=CMultiBar
-Resource8=IDD_MULTIBAR (English (U.S.))
-Resource9=IDD_ABOUTBOX (English (U.S.))
-Resource10=IDD_TEST2
+Resource5=IDR_MAINFRAME (English (U.S.))
+Class8=CMultiBar
+Resource6=IDD_TRASHHEAP
+Resource7=IDD_TEST2
+Resource8=IDR_TOOLBAR (English (U.S.))
+Resource9=IDD_MULTIBAR (English (U.S.))
+Class9=CLayerList
+Resource10=IDD_LAYER_LIST_DIALOG
 
 [CLS:CChildFrame]
 Type=0
@@ -177,20 +177,6 @@ Control1=IDC_STATIC,static,1342308352
 Control2=IDC_CHECK1,button,1342242819
 Control3=IDC_RADIO1,button,1342177289
 
-[DLG:IDD_LAYER_LIST_DIALOG]
-Type=1
-Class=CLayerList
-ControlCount=1
-Control1=IDC_LAYER_LIST,listbox,1352728835
-
-[CLS:CLayerList]
-Type=0
-HeaderFile=LayerList.h
-ImplementationFile=LayerList.cpp
-BaseClass=CDialog
-Filter=D
-LastObject=CLayerList
-
 [CLS:CMultiBar]
 Type=0
 HeaderFile=multibar.h
@@ -240,3 +226,18 @@ Control14=IDC_CHECK14,button,1342242819
 Control15=IDC_CHECK15,button,1342242819
 Control16=IDC_CHECK16,button,1342242819
 
+[DLG:IDD_LAYER_LIST_DIALOG]
+Type=1
+Class=CLayerList
+ControlCount=1
+Control1=IDC_LAYER_LIST,listbox,1352728915
+
+[CLS:CLayerList]
+Type=0
+HeaderFile=LayerList.h
+ImplementationFile=LayerList.cpp
+BaseClass=CDialog
+Filter=D
+VirtualFilter=dWC
+LastObject=CLayerList
+
diff --git a/Utils/MapEdit/MapEdit.rc b/Utils/MapEdit/MapEdit.rc
index 2328eaf72..fba1bc403 100644
--- a/Utils/MapEdit/MapEdit.rc
+++ b/Utils/MapEdit/MapEdit.rc
@@ -424,14 +424,6 @@ BEGIN
                     WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_LAYER_LIST_DIALOG DIALOG DISCARDABLE  0, 0, 112, 95
-STYLE WS_CHILD | WS_BORDER
-FONT 8, "MS Sans Serif"
-BEGIN
-    LISTBOX         IDC_LAYER_LIST,5,5,100,85,LBS_SORT | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-END
-
 IDD_TEST1 DIALOG DISCARDABLE  0, 0, 186, 94
 STYLE WS_CHILD | WS_BORDER
 FONT 8, "MS Sans Serif"
@@ -489,6 +481,15 @@ BEGIN
                     WS_TABSTOP,60,75,41,10
 END
 
+IDD_LAYER_LIST_DIALOG DIALOG DISCARDABLE  0, 0, 106, 94
+STYLE WS_CHILD | WS_BORDER
+FONT 8, "MS Sans Serif"
+BEGIN
+    LISTBOX         IDC_LAYER_LIST,7,7,92,85,LBS_SORT | LBS_OWNERDRAWFIXED | 
+                    LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | 
+                    WS_TABSTOP
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -506,14 +507,6 @@ BEGIN
         BOTTOMMARGIN, 88
     END
 
-    IDD_LAYER_LIST_DIALOG, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 105
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 88
-    END
-
     IDD_TEST1, DIALOG
     BEGIN
         LEFTMARGIN, 7
@@ -529,6 +522,14 @@ BEGIN
         TOPMARGIN, 7
         BOTTOMMARGIN, 79
     END
+
+    IDD_LAYER_LIST_DIALOG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 99
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 87
+    END
 END
 #endif    // APSTUDIO_INVOKED
 
diff --git a/Utils/MapEdit/resource.h b/Utils/MapEdit/resource.h
index 6390b5d21..e20fc568a 100644
--- a/Utils/MapEdit/resource.h
+++ b/Utils/MapEdit/resource.h
@@ -10,14 +10,14 @@
 #define IDR_TOOLBAR                     128
 #define IDR_MAPEDITYPE                  129
 #define IDD_TRASHHEAP                   142
-#define IDD_LAYER_LIST_DIALOG           144
 #define IDD_TEST1                       145
 #define IDD_TEST2                       146
+#define IDD_LAYER_LIST_DIALOG           147
 #define IDC_PARAMBAR_LAYER_LIST         1011
 #define IDC_TILETOOLBAR_COMBO           1013
 #define IDC_TOOLBAR_COMBO               1018
 #define IDC_LIST1                       1019
-#define IDC_LAYER_LIST                  1022
+#define IDC_LAYER_LIST                  1019
 #define IDC_CHECK1                      1023
 #define IDC_CHECK2                      1024
 #define IDC_EDIT1                       1024
@@ -53,7 +53,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        146
+#define _APS_NEXT_RESOURCE_VALUE        148
 #define _APS_NEXT_COMMAND_VALUE         32784
 #define _APS_NEXT_CONTROL_VALUE         1029
 #define _APS_NEXT_SYMED_VALUE           101