diff --git a/Display.cpp b/Display.cpp
index 956f449..19b03a2 100644
--- a/Display.cpp
+++ b/Display.cpp
@@ -61,7 +61,7 @@ SkinDisplay::fileOpen (void)
 	XMMSHandler *xmmsh = XMMSHandler::getInstance();
 	QStringList files;
 
-	files = QFileDialog::getOpenFileNames (NULL, "Select files to play",
+	files = QFileDialog::getOpenFileNames (this, "Select files to play",
 	                                       QDir::homePath(),
 	                                       "Music (*.mp3 *.ogg *.flac *.wav *.mpc *.mp4)");
 
diff --git a/Playlist.cpp b/Playlist.cpp
index d3dc359..9ecbc19 100644
--- a/Playlist.cpp
+++ b/Playlist.cpp
@@ -343,7 +343,7 @@ PlaylistWidget::menuAddFile ()
 	XMMSHandler *xmmsh = XMMSHandler::getInstance();
 	QStringList files;
 
-	files = QFileDialog::getOpenFileNames (NULL, "Select files to play",
+	files = QFileDialog::getOpenFileNames (this, "Select files to play",
 	                                       QDir::homePath(),
 	                                       "Music (*.mp3 *.ogg *.flac *.wav *.mpc *.mp4)");
 
diff --git a/TODO b/TODO
index d0fd52d..1a20aa1 100644
--- a/TODO
+++ b/TODO
@@ -4,14 +4,8 @@ Todo:
 	* ServerConfig
 	* ApplicationConfig
 * Balance
-* VolumeBar
 * Playlist
-	* PlaylistButton
-		* CloseButton
-		* ShadeButton
-		* Add files / folders
 	* Jump entry to dialog
-	* move viewport when walking outside it with keyboard
 	* drag and drop outside viewport
 	* jump to entry when it's played.
 	* accept drops from other applications