diff --git a/CONTROL/control b/CONTROL/control
index 86c370b..f136fa5 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.9.1-2
+Version: 0.9.1-3
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.4),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2
diff --git a/var/mongoose/cgi-bin/browse/chunk/chunk.js b/var/mongoose/cgi-bin/browse/chunk/chunk.js
index 8249dca..9d52ca4 100644
--- a/var/mongoose/cgi-bin/browse/chunk/chunk.js
+++ b/var/mongoose/cgi-bin/browse/chunk/chunk.js
@@ -1,5 +1,6 @@
 var handle;
 var currentpart = 0;
+var stime = 0;
 
 function xprogress()
 {
@@ -25,18 +26,18 @@ function xpart(part)
 
 	if (part++ < parts)
 	{
-		if (window.console)
-			console.log('Extracting part: ' + part);
 		currentpart = part;
 		$('#progressstat' + part)
 		    .text('extracting...')
 		    .addClass('blood');
+		stime = new Date().getTime();
 		$.get('extract.jim?parts=' + parts +
 		    '&part=' + part +
 		    '&file=' + file,
 		    function(data) {
+			var taken = (new Date().getTime() - stime) / 1000;
 			$('#progressstat' + part)
-			    .text('done...')
+			    .text('done... (' + taken + ' seconds)')
 			    .removeClass('blood');
 			currentpart = 0;
 			$('#progresspart' + part)
diff --git a/var/mongoose/cgi-bin/epg_dump.jim b/var/mongoose/cgi-bin/epg/dump.jim
similarity index 100%
rename from var/mongoose/cgi-bin/epg_dump.jim
rename to var/mongoose/cgi-bin/epg/dump.jim
diff --git a/var/mongoose/cgi-bin/epg_info.jim b/var/mongoose/cgi-bin/epg/info.jim
similarity index 91%
rename from var/mongoose/cgi-bin/epg_info.jim
rename to var/mongoose/cgi-bin/epg/info.jim
index b7bbe3d..dc7f710 100755
--- a/var/mongoose/cgi-bin/epg_info.jim
+++ b/var/mongoose/cgi-bin/epg/info.jim
@@ -79,7 +79,7 @@ if {[$record get event_crid] != ""} {
 	puts "
 	<tr>
 		<th>CRID</th><td>
-		<a href=/cgi-bin/epg_search.jim?crid=[$record get event_crid]>
+		<a href=/cgi-bin/epg/search.jim?crid=[$record get event_crid]>
 			<img border=0 height=14
 			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
 			[$record get channel_crid][$record get event_crid]
@@ -93,7 +93,7 @@ if {[$record get series_crid] != ""} {
 	puts "
 	<tr>
 		<th nowrap>Series CRID</th><td>
-		<a href=/cgi-bin/epg_search.jim?scrid=[$record get series_crid]>
+		<a href=/cgi-bin/epg/search.jim?scrid=[$record get series_crid]>
 			<img border=0 height=14
 			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
 			[$record get channel_crid][$record get series_crid]
@@ -107,7 +107,7 @@ if {[$record get rec_crid] != ""} {
 	set rec [$record recommended]
 	if {$rec != ""} {
 		puts "<tr><th>Recommends</th><td>
-			<a href=/cgi-bin/epg_search.jim?crid=[$rec get event_crid]>
+			<a href=/cgi-bin/epg/search.jim?crid=[$rec get event_crid]>
 			<img border=0 height=14
 			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
 			[$rec get name]
@@ -126,7 +126,7 @@ puts "
 	</tr>
 	</table>
 
-	<a class=footnote href=/cgi-bin/epg_dump.jim?service=[$record get service_id]&event=[$record get event_id]&raw=1>
+	<a class=footnote href=/cgi-bin/epg/dump.jim?service=[$record get service_id]&event=[$record get event_id]&raw=1>
 		<img border=0 src=/images/532_1_00_Find_Path_Arrow.png>
 		Show raw EPG info
 	</a>
diff --git a/var/mongoose/cgi-bin/epg_schedule.jim b/var/mongoose/cgi-bin/epg/schedule.jim
similarity index 100%
rename from var/mongoose/cgi-bin/epg_schedule.jim
rename to var/mongoose/cgi-bin/epg/schedule.jim
diff --git a/var/mongoose/cgi-bin/epg_search.jim b/var/mongoose/cgi-bin/epg/search.jim
similarity index 97%
rename from var/mongoose/cgi-bin/epg_search.jim
rename to var/mongoose/cgi-bin/epg/search.jim
index 1d743ec..7de484a 100755
--- a/var/mongoose/cgi-bin/epg_search.jim
+++ b/var/mongoose/cgi-bin/epg/search.jim
@@ -108,7 +108,7 @@ foreach record [lsort -command rsort $records] {
 	puts "<td>[$record get channel_num]</td>"
 	puts "<td>[$record channel_icon 50]</td>"
 	puts "<td nowrap>
-	    <a href=/cgi-bin/epg_service.jim?service=[$record get service_id]>
+	    <a href=/cgi-bin/epg/service.jim?service=[$record get service_id]>
 	    [$record get channel_name]
 	    </a></td>"
 	puts [$record cell]
diff --git a/var/mongoose/cgi-bin/epg_service.jim b/var/mongoose/cgi-bin/epg/service.jim
similarity index 100%
rename from var/mongoose/cgi-bin/epg_service.jim
rename to var/mongoose/cgi-bin/epg/service.jim
diff --git a/var/mongoose/cgi-bin/sched_info.jim b/var/mongoose/cgi-bin/sched_info.jim
index 8b7eba7..a9910d8 100755
--- a/var/mongoose/cgi-bin/sched_info.jim
+++ b/var/mongoose/cgi-bin/sched_info.jim
@@ -101,7 +101,7 @@ if {$crid != ""} {
 	puts "<tr><th>"
 	if $series { puts "Series" } else { puts "Event" }
 	puts " CRID</th><td>"
-	puts -nonewline "<a href=/cgi-bin/epg_search.jim?"
+	puts -nonewline "<a href=/cgi-bin/epg/search.jim?"
 	if $series { puts -nonewline "s" }
 	puts "crid=/$crid>
 	<img border=0 src=/images/421_1_00_CH_Title_2R_Arrow.png
@@ -117,7 +117,7 @@ foreach ev [split [$event get szEventToRecord] "|"] {
 	if {$flag} { puts "<br>" }
 	incr flag
 	set crid [join [lrange [split $ev /] 1 end]]
-	puts -nonewline "<a href=/cgi-bin/epg_search.jim?"
+	puts -nonewline "<a href=/cgi-bin/epg/search.jim?"
 	puts "crid=/$crid>
 	<img border=0 src=/images/421_1_00_CH_Title_2R_Arrow.png
 	    height=14> 
diff --git a/var/mongoose/cgi-bin/xepg.jim b/var/mongoose/cgi-bin/xepg.jim
index b4b5f23..76fbe51 100755
--- a/var/mongoose/cgi-bin/xepg.jim
+++ b/var/mongoose/cgi-bin/xepg.jim
@@ -98,7 +98,7 @@ foreach e $records {
 
 		puts "[$e channel_icon 30]&nbsp;"
 		puts "$chnum
-	    <a href=/cgi-bin/epg_service.jim?service=[$e get service_id]
+	    <a href=/cgi-bin/epg/service.jim?service=[$e get service_id]
 		title=\"[$e get channel_name]\">
 	    [$e get channel_name]
 	    </a></div>"
diff --git a/var/mongoose/html/css/style.css b/var/mongoose/html/css/style.css
index 07df80d..ae88916 100644
--- a/var/mongoose/html/css/style.css
+++ b/var/mongoose/html/css/style.css
@@ -127,7 +127,7 @@ table.keyval td
 	color: black;
 }
 
-pre, .pre
+pre, .pre, .prelike
 {
         font-family: Consolas, 'Courier New', Courier, monospace;
         color: black;
@@ -145,7 +145,10 @@ pre, .pre
         -webkit-border-top-right-radius: 4px;
         -moz-border-radius-topright: 4px;
         -khtml-border-top-right-radius: 4px;
+}
 
+pre, .pre
+{
 	white-space: pre-wrap;
 	white-space: -moz-pre-wrap !important;
 	white-space: -pre-wrap;
diff --git a/var/mongoose/html/diag.shtml b/var/mongoose/html/diag.shtml
index b40f90f..5838894 100644
--- a/var/mongoose/html/diag.shtml
+++ b/var/mongoose/html/diag.shtml
@@ -15,7 +15,7 @@ Diagnostic:
 </fieldset>
 
 <div style="margin-top: 2em; display: none; float: left; clear: left"
-class=pre id=results></div>
+    id=results></div>
 
 <script type=text/javascript>
 $('#rundiag').button().click(function() {
@@ -30,7 +30,9 @@ $('a.log').click(function() {
 	    .slideDown()
 	    .text('\n\nLoading log, please wait...\n\n')
 	    .load('/cgi-bin/cat.jim?file=' +
-	    encodeURIComponent($(this).attr('file')));
+	        encodeURIComponent($(this).attr('file')), function() {
+	    		$('#results').wrapInner('<pre>');
+		});
 });
 </script>
 
diff --git a/var/mongoose/include/epg.jim b/var/mongoose/include/epg.jim
index c95b119..d4fd2fb 100755
--- a/var/mongoose/include/epg.jim
+++ b/var/mongoose/include/epg.jim
@@ -55,7 +55,7 @@ foreach record $records {
 		puts "<td>$chnum</td>"
 		puts "<td>[$record channel_icon 50]</td>
 		    <td>
-	    <a href=/cgi-bin/epg_service.jim?service=[$record get service_id]>
+	    <a href=/cgi-bin/epg/service.jim?service=[$record get service_id]>
 		    [$record get channel_name]
 		    </a></td>"
 		set lcn $chnum
diff --git a/var/mongoose/include/restart.jim b/var/mongoose/include/restart.jim
index b7d47f7..e20d4ad 100755
--- a/var/mongoose/include/restart.jim
+++ b/var/mongoose/include/restart.jim
@@ -25,7 +25,7 @@ if {[system busy]} {
 }
 
 puts {
-	<small><button id=restart_cancel>Hide</button></small>
+	<small><button id=restart_cancel>Dismiss</button></small>
 	</font>
 	</div>
 	<div style="width: 60%; height: 0.7em; margin-bottom: 2em;
diff --git a/var/mongoose/lib/epg_popup b/var/mongoose/lib/epg_popup
index 52d09b9..dc0b4be 100644
--- a/var/mongoose/lib/epg_popup
+++ b/var/mongoose/lib/epg_popup
@@ -4,7 +4,7 @@ puts {
 $(document).ready(function() {
 	function doschedule(type)
 	{
-		$('#epginfo_extra').load('/cgi-bin/epg_schedule.jim?' +
+		$('#epginfo_extra').load('/cgi-bin/epg/schedule.jim?' +
 		    'service=' +
 		    encodeURIComponent($('#dialogue').attr('xs')) +
 		    '&event=' +
@@ -52,7 +52,7 @@ $(document).ready(function() {
 			$dialog.dialog("option", "buttons", $buttons2);
 		else
 			$dialog.dialog("option", "buttons", $buttons1);
-		var url = '/cgi-bin/epg_info.jim?service=' +
+		var url = '/cgi-bin/epg/info.jim?service=' +
 		    o.attr('xs') + '&event=' +
 		    o.attr('xe') + '&bare=1';
 		$('#dialogue').load(url, function() {
diff --git a/var/mongoose/lib/epg_search b/var/mongoose/lib/epg_search
index 0334d25..894690d 100755
--- a/var/mongoose/lib/epg_search
+++ b/var/mongoose/lib/epg_search
@@ -13,7 +13,7 @@ set searchfull 0
 catch { if {[dict exists $_cgi full]} { set searchfull 1 } }
 
 puts "
-<form method=get action=/cgi-bin/epg_search.jim>
+<form method=get action=/cgi-bin/epg/search.jim>
 <fieldset>
 <legend>EPG Search</legend>
 <label for=term>Query</label>
@@ -31,7 +31,7 @@ puts ">
 "
 
 proc cts {type img text} {
-	puts "<a href=/cgi-bin/epg_search.jim?ct=$type>
+	puts "<a href=/cgi-bin/epg/search.jim?ct=$type>
 		<img height=18 border=0 src=/images/173_3_00_G3_$img.png>
 		&nbsp;$text</a>";
 }
@@ -96,7 +96,7 @@ if {[llength $res] > 0} {
 		set kw [string range [lindex $keyword 1] 1 end]
 		# Clean the keyword string.
 		regexp -nocase {^(\w+)} $kw kw
-		puts "<td><a href=/cgi-bin/epg_search.jim?term=[cgi_quote_url $kw]>$kw
+		puts "<td><a href=/cgi-bin/epg/search.jim?term=[cgi_quote_url $kw]>$kw
 		    </a></td>"
 	}
 	puts "