diff --git a/reactos/subsys/system/explorer/explorer.cpp b/reactos/subsys/system/explorer/explorer.cpp
index 16df1421e80..e2814553cd8 100644
--- a/reactos/subsys/system/explorer/explorer.cpp
+++ b/reactos/subsys/system/explorer/explorer.cpp
@@ -534,8 +534,10 @@ void explorer_show_frame(int cmdshow, LPTSTR lpCmdLine)
 
 	g_Globals._prescan_nodes = false;
 
+	bool mdi = true;	//@@
+
 	 // create main window
-	MainFrameBase::Create(lpCmdLine, true, cmdshow);
+	MainFrameBase::Create(lpCmdLine, mdi, cmdshow);
 }
 
 
diff --git a/reactos/subsys/system/explorer/shell/entries.cpp b/reactos/subsys/system/explorer/shell/entries.cpp
index e849688bed7..cb008704068 100644
--- a/reactos/subsys/system/explorer/shell/entries.cpp
+++ b/reactos/subsys/system/explorer/shell/entries.cpp
@@ -168,10 +168,16 @@ Root::~Root()
  // directories first...
 static int compareType(const WIN32_FIND_DATA* fd1, const WIN32_FIND_DATA* fd2)
 {
-	int dir1 = fd1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
-	int dir2 = fd2->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
+	int order1 = fd1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
+	int order2 = fd2->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
 
-	return dir2==dir1? 0: dir2<dir1? -1: 1;
+	/* Handle "." and ".." as special case and move them at the very first beginning. */
+	if (order1 && order2) {
+		order1 = fd1->cFileName[0]!='.'? 1: fd1->cFileName[1]=='.'? 2: fd1->cFileName[1]=='\0'? 3: 1;
+		order2 = fd2->cFileName[0]!='.'? 1: fd2->cFileName[1]=='.'? 2: fd2->cFileName[1]=='\0'? 3: 1;
+	}
+
+	return order2==order1? 0: order2<order1? -1: 1;
 }
 
 
diff --git a/reactos/subsys/system/explorer/shell/mainframe.cpp b/reactos/subsys/system/explorer/shell/mainframe.cpp
index 88a13817dc0..7cd24d0a776 100644
--- a/reactos/subsys/system/explorer/shell/mainframe.cpp
+++ b/reactos/subsys/system/explorer/shell/mainframe.cpp
@@ -163,15 +163,6 @@ MainFrameBase::MainFrameBase(HWND hwnd)
 #ifdef _NO_REBAR
 		{0, 0, 0, BTNS_SEP, {0, 0}, 0, 0},
 #endif
-		{0, ID_WINDOW_NEW, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0},
-		{1, ID_WINDOW_CASCADE, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0},
-		{2, ID_WINDOW_TILE_HORZ, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0},
-		{3, ID_WINDOW_TILE_VERT, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0},
-/*TODO
-		{4, ID_... , TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0},
-		{5, ID_... , TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0},
-*/
-		{0, 0, 0, BTNS_SEP, {0, 0}, 0, 0},
 		{7, ID_GO_BACK, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0},
 		{8, ID_GO_FORWARD, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0},
 		{9, ID_GO_UP, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0},
@@ -179,6 +170,12 @@ MainFrameBase::MainFrameBase(HWND hwnd)
 		{11, ID_GO_SEARCH, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0},
 		{12, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0},
 		{13, ID_STOP, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0},
+/*		{0, 0, 0, BTNS_SEP, {0, 0}, 0, 0},
+		{0, ID_WINDOW_NEW, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0},
+		{1, ID_WINDOW_CASCADE, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0},
+		{2, ID_WINDOW_TILE_HORZ, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0},
+		{3, ID_WINDOW_TILE_VERT, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0},
+*/
 	};
 
 	_htoolbar = CreateToolbarEx(hwnd, 
diff --git a/reactos/subsys/system/winefile/winefile.c b/reactos/subsys/system/winefile/winefile.c
index 4a07b2a8aa5..0f35270afc1 100644
--- a/reactos/subsys/system/winefile/winefile.c
+++ b/reactos/subsys/system/winefile/winefile.c
@@ -973,10 +973,16 @@ static void read_directory_shell(Entry* dir, HWND hwnd)
 /* directories first... */
 static int compareType(const WIN32_FIND_DATA* fd1, const WIN32_FIND_DATA* fd2)
 {
-	int dir1 = fd1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
-	int dir2 = fd2->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
+	int order1 = fd1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
+	int order2 = fd2->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
 
-	return dir2==dir1? 0: dir2<dir1? -1: 1;
+	/* Handle "." and ".." as special case and move them at the very first beginning. */
+	if (order1 && order2) {
+		order1 = fd1->cFileName[0]!='.'? 1: fd1->cFileName[1]=='.'? 2: fd1->cFileName[1]=='\0'? 3: 1;
+		order2 = fd2->cFileName[0]!='.'? 1: fd2->cFileName[1]=='.'? 2: fd2->cFileName[1]=='\0'? 3: 1;
+	}
+
+	return order2==order1? 0: order2<order1? -1: 1;
 }