diff --git a/trunk/images/next.png b/trunk/images/next.png
index 58be8152..e13146f0 100644
Binary files a/trunk/images/next.png and b/trunk/images/next.png differ
diff --git a/trunk/images/pause.png b/trunk/images/pause.png
index baea442f..6be708ff 100644
Binary files a/trunk/images/pause.png and b/trunk/images/pause.png differ
diff --git a/trunk/images/play.png b/trunk/images/play.png
index 73e4889b..787c6f6d 100644
Binary files a/trunk/images/play.png and b/trunk/images/play.png differ
diff --git a/trunk/images/stop.png b/trunk/images/stop.png
index f48c81fe..1b2515e4 100644
Binary files a/trunk/images/stop.png and b/trunk/images/stop.png differ
diff --git a/trunk/src/GuiObjects/__init__.py b/trunk/src/GuiObjects/__init__.py
index 82625f3d..cf6fbd76 100644
--- a/trunk/src/GuiObjects/__init__.py
+++ b/trunk/src/GuiObjects/__init__.py
@@ -1,3 +1,3 @@
 # Used for initializing things in the GuiObjects directory
 
-__all__ = ['button','menuItem','libView','plistView']
+__all__ = ['button','menuItem','libView','infoView','plistView']
diff --git a/trunk/src/GuiObjects/infoView.py b/trunk/src/GuiObjects/infoView.py
new file mode 100644
index 00000000..6598121b
--- /dev/null
+++ b/trunk/src/GuiObjects/infoView.py
@@ -0,0 +1,44 @@
+import pango
+import gobject
+import pygtk
+pygtk.require('2.0')
+import gtk
+
+
+class InfoView(gtk.VBox):
+	def __init__(self,data):
+		gtk.VBox.__init__(self,False,0)
+		self.data = data
+		self.title = self.makeLabel("",13000)
+		self.album = self.makeLabel("",10000)
+		self.artist = self.makeLabel("",10000)
+		self.changeLabels()
+		gobject.timeout_add(1000,self.changeLabels)
+		self.show()
+
+
+	def changeLabels(self):
+		title = ""
+		album = ""
+		artist = ""
+		if self.data.song.info:
+			title = self.data.song.info.title
+			album = self.data.song.info.album
+			artist = self.data.song.info.artist
+		self.title.set_text("Title: "+title)
+		self.album.set_text("Album: "+album)
+		self.artist.set_text("Artist "+artist)
+		return True
+
+
+	def makeLabel(self,text,size):
+		label = gtk.Label(text)
+		align = gtk.Alignment(0,1,0,0)
+		attr = pango.AttrList()
+		attr.insert(pango.AttrSize(size,0,-1))
+		label.set_attributes(attr)
+		align.add(label)
+		self.pack_start(align,False,False,0)
+		label.show()
+		align.show()
+		return label
diff --git a/trunk/src/GuiObjects/plistView.py b/trunk/src/GuiObjects/plistView.py
index 756f2faf..7a2da553 100644
--- a/trunk/src/GuiObjects/plistView.py
+++ b/trunk/src/GuiObjects/plistView.py
@@ -17,6 +17,7 @@ class PlistView(gtk.ScrolledWindow):
 		self.makeList()
 		self.loadSong()
 		gobject.timeout_add(1000,self.checkUpdate)
+		self.show()
 
 
 	# Check if the playlist has been updated
@@ -138,11 +139,26 @@ class PlistView(gtk.ScrolledWindow):
 			return
 		selrow = 0
 		row = 0
-		for i in range(len(self.trackList)):
-			if self.trackList[i] == self.data.curSong:
+		for i in range(len(self.data.curList)):
+			if self.trackList[i][0] == self.data.song.info.id:
 				if i > 10:
 					selrow = i - 10
 				row = i
 			break
-		#self.tree.scroll_to_cell(selrow,None,True,0,0)
-		self.tree.set_cursor(self.data.curSong,None,False)
+		print selrow,row
+		self.tree.scroll_to_cell(selrow,None,True,0,0)
+		treesel = self.tree.get_selection()
+		treesel.select_path(row)
+		#model = self.tree.get_model()
+		#selrow = 0
+		#row = 0
+		#for i in range(len(model)):
+			#if i > 10:
+			#	selrow = self.trackList[i - 10][0]
+		#	if model[i][0] == self.data.curSong:
+		#		row = i
+		#		break
+		#print model[i][0],self.data.curSong,row
+		#print self.tree[row][0],self.data.curSong
+		#self.tree.scroll_to_cell(row,None,False,0,0)
+		#model.set_cursor(row,None,False)
diff --git a/trunk/src/song.py b/trunk/src/song.py
index 4fa71116..32c717fa 100644
--- a/trunk/src/song.py
+++ b/trunk/src/song.py
@@ -12,10 +12,11 @@ class Song():
 		self.quit=exitFunc
 		# initialize player pipeline
 		self.next = None
+		self.info = None
 		self.player = gst.Pipeline("player")
 		self.bin = gst.element_factory_make("playbin",None)
 		self.player.add(self.bin)
-		
+
 		# initialize bus
 		bus = self.player.get_bus()
 		bus.add_signal_watch()
diff --git a/trunk/src/window.py b/trunk/src/window.py
index 6345ad3a..1a3d389c 100644
--- a/trunk/src/window.py
+++ b/trunk/src/window.py
@@ -10,6 +10,7 @@ from GuiObjects.menuItem import MenuItem
 from GuiObjects.libView import LibView
 from GuiObjects.plistView import PlistView
 from GuiObjects.controlPanel import ControlPanel
+from GuiObjects.infoView import InfoView
 
 
 class Window(gtk.Window):
@@ -183,8 +184,9 @@ class Window(gtk.Window):
 		
 		rightPane=gtk.VBox(False,0)
 
+		infoview = InfoView(self.data)
+		rightPane.pack_start(infoview,False,False,0)
 		self.plistview = PlistView(self.data)
-		self.plistview.show()
 		rightPane.add(self.plistview)
 		self.makeBottomRow(rightPane)
 		rightPane.show()