diff --git a/CONTROL/control b/CONTROL/control
index ff32e7c..017fa26 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.9.7-3
+Version: 0.9.8
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: webif-channelicons(>=1.0.1),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control(>=1.2),busybox(>=1.19.3-1),lsof,epg(>=1.0.9),hmt(>=1.1.6),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.1)
diff --git a/var/mongoose/cgi-bin/env.jim b/var/mongoose/cgi-bin/env.jim
new file mode 100755
index 0000000..34c629a
--- /dev/null
+++ b/var/mongoose/cgi-bin/env.jim
@@ -0,0 +1,8 @@
+#!/mod/bin/jimsh
+
+puts "Content-type: text/plain\n"
+
+foreach f [dict keys $env] {
+	puts "$f = $env($f)"
+}
+
diff --git a/var/mongoose/html/css/style.css b/var/mongoose/html/css/style.css
index ae88916..767c8c8 100644
--- a/var/mongoose/html/css/style.css
+++ b/var/mongoose/html/css/style.css
@@ -326,3 +326,35 @@ div.cut
 	background: transparent;
 }
 
+#toolbarouter
+{
+	position: relative;
+}
+
+#toolbar
+{
+	position: absolute;
+	top: -20px;
+	left: 30px;
+	z-index: 29;
+	display: none;
+	width: 80%;
+	border: 1px solid #899caa;
+	box-shadow: 2px 2px 11px #666;
+	-moz-box-shadow: 2px 2px 11px #666;
+	-webkit-box-shadow: 2px 2px 11px #666;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	margin-top: -1px;
+	background: #d2e0ea;
+	padding: 6px;
+}
+
+span.toolbarcell
+{
+	float: left;
+	border-right: 1px solid #ccc;
+	text-align: center;
+	padding: 0 1em;
+}
+
diff --git a/var/mongoose/html/lib/topbar.jim b/var/mongoose/html/lib/topbar.jim
index 8088bb0..ccc4a71 100644
--- a/var/mongoose/html/lib/topbar.jim
+++ b/var/mongoose/html/lib/topbar.jim
@@ -19,6 +19,9 @@ puts {
 	</div>
 	<div class=right><img src=/images/154_1_00_WIN_MD116_3R.png></div>
 </div>
+}
+source /mod/var/mongoose/include/toolbar.jim
+puts {
 <script type=text/javascript>
 $('#topbar').hover(
     function() { $(this).css('cursor', 'pointer'); },
diff --git a/var/mongoose/html/lib/topbar.shtml b/var/mongoose/html/lib/topbar.shtml
index 3f95b61..1ec48cf 100644
--- a/var/mongoose/html/lib/topbar.shtml
+++ b/var/mongoose/html/lib/topbar.shtml
@@ -13,10 +13,14 @@
 	</div>
 	<div class=right><img src=/images/154_1_00_WIN_MD116_3R.png></div>
 </div>
+<!--#exec cmd="/mod/var/mongoose/include/toolbar.jim" -->
 <script type=text/javascript>
 $('#topbar').hover(
-    function() { $(this).css('cursor', 'pointer'); },
-    function() { $(this).css('cursor', 'auto'); }
+    function() {
+		$(this).css('cursor', 'pointer');
+    }, function() {
+		$(this).css('cursor', 'auto');
+    }
 );
 </script>
 
diff --git a/var/mongoose/include/services.jim b/var/mongoose/include/services.jim
index 68d21b8..015d23e 100755
--- a/var/mongoose/include/services.jim
+++ b/var/mongoose/include/services.jim
@@ -15,7 +15,7 @@ foreach service $services {
 	if ($auto) { puts -nonewline " checked" }
 	puts "></td>"
 
-	puts -nonewline "<td><input type=checkbox class=toggle name=\"$name\"""
+	puts -nonewline "<td><input type=checkbox class=toggle name=\"$name\""
 	if ($running) { puts -nonewline " checked" }
 	puts "></td>"
 
diff --git a/var/mongoose/include/toolbar.jim b/var/mongoose/include/toolbar.jim
new file mode 100755
index 0000000..1d28f5e
--- /dev/null
+++ b/var/mongoose/include/toolbar.jim
@@ -0,0 +1,51 @@
+#!/mod/bin/jimsh
+
+source /mod/var/mongoose/lib/setup
+require plugin settings.class
+
+if {[[settings] epg_style] eq "grid"} {
+	set epglink "/cgi-bin/xepg.jim"
+} else {
+	set epglink "/epg.shtml"
+}
+
+proc tb {icon txt link {size 50}} {
+	puts -nonewline "<span class=toolbarcell>
+	    <a href=\"$link\">
+		<img src=\"$icon\" height=$size border=0>
+		<br>
+		$txt
+	    </a>
+	  </span>
+	"
+}
+
+puts {
+<div id=toolbarouter>
+ <div id=toolbar>
+}
+
+tb "/images/323_1_10_Menu_Video.png" "Browse" "/cgi-bin-browse.jim"
+tb "/images/321_1_00_Menu_CHList.png" "Schedule" "/sched/sched.jim"
+tb "/images/328_1_26_Menu_TV_Guide.png" "EPG" $epglink
+tb "/img/spanner.png" "Services" "/services.shtml"
+tb "/img/packages.png" "Packages" "/pkg.shtml"
+tb "/images/326_1_00_Menu_Settings.png" "Settings" "/cgi-bin/settings.jim"
+tb "/img/diagnostics.png" "Diag" "/diag/diag.jim"
+eval_plugins toolbar
+
+puts {
+ </div>
+</div>
+
+<script type=text/javascript>
+$('#topbar, #toolbar').hover(
+    function() {
+		$('#toolbar').stop(true, true).delay(200).slideDown();
+    }, function() {
+		$('#toolbar').stop(true, true).delay(200).slideUp();
+    }
+);
+</script>
+}
+