diff --git a/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp b/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp
index 46b21de3606..eb9ada9c023 100644
--- a/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp
+++ b/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp
@@ -158,7 +158,7 @@ int QuickLaunchBar::Command(int id, int code)
 int QuickLaunchBar::Notify(int id, NMHDR* pnmh)
 {
 	switch(pnmh->code) {
-	  case TTN_GETDISPINFO: {
+	  case TTN_GETDISPINFO: {	//TODO: TTN_GETDISPINFO is only received, if desktop bar window has the focus?!
 		NMTTDISPINFO* ttdi = (NMTTDISPINFO*) pnmh;
 
 		int id = ttdi->hdr.idFrom;
diff --git a/reactos/subsys/system/explorer/taskbar/startmenu.cpp b/reactos/subsys/system/explorer/taskbar/startmenu.cpp
index aca56bb133d..e38d56fc9bd 100644
--- a/reactos/subsys/system/explorer/taskbar/startmenu.cpp
+++ b/reactos/subsys/system/explorer/taskbar/startmenu.cpp
@@ -77,6 +77,7 @@ Window::CREATORFUNC StartMenu::s_def_creator = STARTMENU_CREATOR(StartMenu);
 
 HWND StartMenu::Create(int x, int y, const StartMenuFolders& folders, HWND hwndParent, CREATORFUNC creator)
 {
+	//TODO: check, if coordinates x/y are visible on the screen
 	return Window::Create(creator, &folders, 0, s_wcStartMenu, NULL,
 							WS_POPUP|WS_THICKFRAME|WS_CLIPCHILDREN|WS_VISIBLE, x, y, STARTMENU_WIDTH_MIN, 4/*start height*/, hwndParent);
 }
@@ -181,7 +182,7 @@ LRESULT StartMenu::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
 	  case WM_SETFOCUS:
 		break;	// don't post WM_CANCELMODE in Window::WndProc when focusing the startmenu
 
-	  case PM_STARTENTRY_FOCUSED: {
+	  case PM_STARTENTRY_FOCUSED: {	//TODO: use TrackMouseEvent() and WM_MOUSEHOVER to wait a bit before opening submenus
 		BOOL hasSubmenu = wparam;
 		HWND hctrl = (HWND)lparam;
 
@@ -423,7 +424,7 @@ void StartMenu::ActivateEntry(int id, ShellEntry* entry)
 
 		CreateSubmenu(id, new_folders);
 	} else {
-		entry->launch_entry(_hwnd);	//TODO: launch in the background
+		entry->launch_entry(_hwnd);	//TODO: launch in the background; specify correct HWND for error message box titles
 
 		 // close start menus after launching the selected entry
 		CloseStartMenu(id);
diff --git a/reactos/subsys/system/explorer/taskbar/startmenu.h b/reactos/subsys/system/explorer/taskbar/startmenu.h
index 5f531ad8e91..fc9b4607b37 100644
--- a/reactos/subsys/system/explorer/taskbar/startmenu.h
+++ b/reactos/subsys/system/explorer/taskbar/startmenu.h
@@ -132,7 +132,7 @@ struct StartMenu : public OwnerDrawParent<Dialog>
 	StartMenu(HWND hwnd, const StartMenuFolders& info);
 	~StartMenu();
 
-	static HWND Create(int x, int y, HWND hwndParent=0);
+//	static HWND Create(int x, int y, HWND hwndParent=0);
 	static HWND Create(int x, int y, const StartMenuFolders&, HWND hwndParent=0, CREATORFUNC creator=s_def_creator);
 	static CREATORFUNC s_def_creator;
 
diff --git a/reactos/subsys/system/explorer/taskbar/traynotify.cpp b/reactos/subsys/system/explorer/taskbar/traynotify.cpp
index bff6c2647bf..c2087b012cf 100644
--- a/reactos/subsys/system/explorer/taskbar/traynotify.cpp
+++ b/reactos/subsys/system/explorer/taskbar/traynotify.cpp
@@ -220,7 +220,7 @@ void NotifyArea::Refresh()
 
 void NotifyArea::Paint()
 {
-	PaintCanvas canvas(_hwnd);
+	BufferedPaintCanvas canvas(_hwnd);
 
 	 // first fill with the background color
 	FillRect(canvas, &canvas.rcPaint, GetSysColorBrush(COLOR_BTNFACE));
diff --git a/reactos/subsys/system/explorer/winefile/makefile b/reactos/subsys/system/explorer/winefile/makefile
index f749681f21f..7b4e55e6b72 100644
--- a/reactos/subsys/system/explorer/winefile/makefile
+++ b/reactos/subsys/system/explorer/winefile/makefile
@@ -24,7 +24,7 @@ endif
 
 VPATH += ../utility
 VPATH += ../shell
-VPATH += ../taskbar
+VPATH += plugins
 
 WINE_MODE = yes
 
diff --git a/reactos/subsys/system/explorer/taskbar/ex_bar.c b/reactos/subsys/system/explorer/winefile/plugins/ex_bar.c
similarity index 100%
rename from reactos/subsys/system/explorer/taskbar/ex_bar.c
rename to reactos/subsys/system/explorer/winefile/plugins/ex_bar.c
diff --git a/reactos/subsys/system/explorer/taskbar/ex_bar.h b/reactos/subsys/system/explorer/winefile/plugins/ex_bar.h
similarity index 100%
rename from reactos/subsys/system/explorer/taskbar/ex_bar.h
rename to reactos/subsys/system/explorer/winefile/plugins/ex_bar.h
diff --git a/reactos/subsys/system/explorer/taskbar/ex_clock.c b/reactos/subsys/system/explorer/winefile/plugins/ex_clock.c
similarity index 100%
rename from reactos/subsys/system/explorer/taskbar/ex_clock.c
rename to reactos/subsys/system/explorer/winefile/plugins/ex_clock.c
diff --git a/reactos/subsys/system/explorer/taskbar/ex_menu.c b/reactos/subsys/system/explorer/winefile/plugins/ex_menu.c
similarity index 100%
rename from reactos/subsys/system/explorer/taskbar/ex_menu.c
rename to reactos/subsys/system/explorer/winefile/plugins/ex_menu.c
diff --git a/reactos/subsys/system/explorer/taskbar/ex_shutdwn.c b/reactos/subsys/system/explorer/winefile/plugins/ex_shutdwn.c
similarity index 100%
rename from reactos/subsys/system/explorer/taskbar/ex_shutdwn.c
rename to reactos/subsys/system/explorer/winefile/plugins/ex_shutdwn.c
diff --git a/reactos/subsys/system/explorer/winefile/wine_explore.dsp b/reactos/subsys/system/explorer/winefile/wine_explore.dsp
index 889e84e1004..a692936cb95 100644
--- a/reactos/subsys/system/explorer/winefile/wine_explore.dsp
+++ b/reactos/subsys/system/explorer/winefile/wine_explore.dsp
@@ -288,23 +288,23 @@ SOURCE=.\winefile.rc
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\taskbar\ex_bar.c
+SOURCE=.\plugins\ex_bar.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\taskbar\ex_bar.h
+SOURCE=.\plugins\ex_bar.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\taskbar\ex_clock.c
+SOURCE=.\plugins\ex_clock.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\taskbar\ex_menu.c
+SOURCE=.\plugins\ex_menu.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\taskbar\ex_shutdwn.c
+SOURCE=.\plugins\ex_shutdwn.c
 # End Source File
 # End Group
 # Begin Source File