--- tvheadend-git/src/webui/static/app/epg.js	2011-04-13 09:01:13.751138001 +0200
+++ tvheadend/src/webui/static/app/epg.js	2011-04-13 11:35:58.000000000 +0200
@@ -182,6 +182,28 @@ tvheadend.epg = function() {
     var epgCm = new Ext.grid.ColumnModel([
 	actions,
 	{
+	    width: 50,
+	    header: "M3U",
+	    dataIndex: 'channelid',
+	    renderer: function(value, metadata, record, row, col, store) {
+		url = 'playlist/channelid/' + value;
+		return '<a href="'+url+'">Load</a>';
+	    }
+	},{
+	    header: "Embedded",
+	    dataIndex: 'channelid',
+	    width: 60,
+	    renderer: function(value, metadata, record, row, col, store) {
+	    	url = 'stream/channelid/' + value
+	    	return "<a href=\"javascript:tvheadend.VLC('"+url+"')\">Play</a>"
+	    }
+	},{
+	    width: 250,
+	    id:'channel',
+	    header: "Channel",
+	    dataIndex: 'channel',
+	    renderer: renderText
+	},{
 	    width: 250,
 	    id:'title',
 	    header: "Title",
@@ -214,12 +236,6 @@ tvheadend.epg = function() {
 	    renderer: renderDuration
 	},{
 	    width: 250,
-	    id:'channel',
-	    header: "Channel",
-	    dataIndex: 'channel',
-	    renderer: renderText
-	},{
-	    width: 250,
 	    id:'contentgrp',
 	    header: "Content Type",
 	    dataIndex: 'contentgrp',
@@ -336,9 +352,14 @@ tvheadend.epg = function() {
 	plugins: [actions],
 	title: 'Electronic Program Guide',
 	iconCls: 'newspaper',
-        store : epgStore,
+       store : epgStore,
 	selModel : new Ext.ux.grid.livegrid.RowSelectionModel(),
 	view : epgView,
+	listeners: { 
+		cellclick: function(grid,rowIndex,colIndex) {
+			if (colIndex > 2) new tvheadend.epgDetails(grid.getStore().getAt(rowIndex).data);
+		}
+	},
 	tbar: [
 	    epgFilterTitle,
 	    '-',
@@ -383,14 +404,7 @@ tvheadend.epg = function() {
 	    displayInfo : true
 	})
     });
-
-    panel.on('rowclick', rowclicked);
-
-
-    function rowclicked(grid, index) {
-	new tvheadend.epgDetails(grid.getStore().getAt(index).data);
-    }
-
+    
     function createAutoRec() {
 
 	var title = epgStore.baseParams.title ?