diff --git a/CONTROL/control b/CONTROL/control
index f306a23..73418ed 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.7.0-2
+Version: 0.7.0-3
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4),jim-oo,jim-pack,service-control,busybox(>=1.18.3-1),lsof,epg(>=1.0.3),hmt(>=1.0.6),ssmtp
diff --git a/var/mongoose/html/img/channels/1-2-1 Dating.png b/var/mongoose/html/img/channels/1-2-1 Dating.png
new file mode 120000
index 0000000..96837bd
--- /dev/null
+++ b/var/mongoose/html/img/channels/1-2-1 Dating.png	
@@ -0,0 +1 @@
+blank.png
\ No newline at end of file
diff --git a/var/mongoose/html/img/channels/5*.png b/var/mongoose/html/img/channels/5*.png
index 28bd226..20c09aa 100644
Binary files a/var/mongoose/html/img/channels/5*.png and b/var/mongoose/html/img/channels/5*.png differ
diff --git a/var/mongoose/html/img/channels/5_.png b/var/mongoose/html/img/channels/5_.png
new file mode 100644
index 0000000..20c09aa
Binary files /dev/null and b/var/mongoose/html/img/channels/5_.png differ
diff --git a/var/mongoose/html/img/channels/ADULT Babestn2.png b/var/mongoose/html/img/channels/ADULT Babestn2.png
new file mode 100644
index 0000000..05ffde4
Binary files /dev/null and b/var/mongoose/html/img/channels/ADULT Babestn2.png differ
diff --git a/var/mongoose/html/img/channels/ADULT Blue.png b/var/mongoose/html/img/channels/ADULT Blue.png
new file mode 100644
index 0000000..4c2d557
Binary files /dev/null and b/var/mongoose/html/img/channels/ADULT Blue.png differ
diff --git a/var/mongoose/html/img/channels/ADULT Filth.png b/var/mongoose/html/img/channels/ADULT Filth.png
new file mode 100644
index 0000000..fbac535
Binary files /dev/null and b/var/mongoose/html/img/channels/ADULT Filth.png differ
diff --git a/var/mongoose/html/img/channels/ADULT PARTY.png b/var/mongoose/html/img/channels/ADULT PARTY.png
new file mode 100644
index 0000000..05e5b55
Binary files /dev/null and b/var/mongoose/html/img/channels/ADULT PARTY.png differ
diff --git a/var/mongoose/html/img/channels/ADULT redhotTV.png b/var/mongoose/html/img/channels/ADULT redhotTV.png
new file mode 100644
index 0000000..183dbae
Binary files /dev/null and b/var/mongoose/html/img/channels/ADULT redhotTV.png differ
diff --git a/var/mongoose/html/img/channels/CONNECT.png b/var/mongoose/html/img/channels/CONNECT.png
new file mode 120000
index 0000000..96837bd
--- /dev/null
+++ b/var/mongoose/html/img/channels/CONNECT.png
@@ -0,0 +1 @@
+blank.png
\ No newline at end of file
diff --git a/var/mongoose/html/img/channels/Capital FM.png b/var/mongoose/html/img/channels/Capital FM.png
new file mode 100644
index 0000000..9307d30
Binary files /dev/null and b/var/mongoose/html/img/channels/Capital FM.png differ
diff --git a/var/mongoose/html/img/channels/Challenge.png b/var/mongoose/html/img/channels/Challenge.png
index cfd5c9b..3c01002 100644
Binary files a/var/mongoose/html/img/channels/Challenge.png and b/var/mongoose/html/img/channels/Challenge.png differ
diff --git a/var/mongoose/html/img/channels/Channel 5.png b/var/mongoose/html/img/channels/Channel 5.png
index a75b583..6a0aa2b 100644
Binary files a/var/mongoose/html/img/channels/Channel 5.png and b/var/mongoose/html/img/channels/Channel 5.png differ
diff --git a/var/mongoose/html/img/channels/Really.png b/var/mongoose/html/img/channels/Really.png
new file mode 100644
index 0000000..becb5bd
Binary files /dev/null and b/var/mongoose/html/img/channels/Really.png differ
diff --git a/var/mongoose/html/img/channels/STREAM.png b/var/mongoose/html/img/channels/STREAM.png
new file mode 120000
index 0000000..96837bd
--- /dev/null
+++ b/var/mongoose/html/img/channels/STREAM.png
@@ -0,0 +1 @@
+blank.png
\ No newline at end of file
diff --git a/var/mongoose/html/img/channels/VISION.png b/var/mongoose/html/img/channels/VISION.png
new file mode 120000
index 0000000..96837bd
--- /dev/null
+++ b/var/mongoose/html/img/channels/VISION.png
@@ -0,0 +1 @@
+blank.png
\ No newline at end of file
diff --git a/var/mongoose/html/img/channels/bid tv.png b/var/mongoose/html/img/channels/bid tv.png
index d8208fe..1e0ad02 100644
Binary files a/var/mongoose/html/img/channels/bid tv.png and b/var/mongoose/html/img/channels/bid tv.png differ
diff --git a/var/mongoose/html/img/channels/blank.png b/var/mongoose/html/img/channels/blank.png
new file mode 100644
index 0000000..534992f
Binary files /dev/null and b/var/mongoose/html/img/channels/blank.png differ
diff --git a/var/mongoose/html/img/channels/price-drop tv.png b/var/mongoose/html/img/channels/price-drop tv.png
index 0c8fb6e..e926d99 100644
Binary files a/var/mongoose/html/img/channels/price-drop tv.png and b/var/mongoose/html/img/channels/price-drop tv.png differ
diff --git a/var/mongoose/lib/epg.class b/var/mongoose/lib/epg.class
index 4973a47..101fc42 100644
--- a/var/mongoose/lib/epg.class
+++ b/var/mongoose/lib/epg.class
@@ -208,7 +208,7 @@ epg method icon_set {{height 0}} {
 epg method cell {} {
 	set percent [$self percent]
 
-	puts "<td nowrap valign=top title=\"$text\">"
+	puts "<td nowrap valign=top>"
 
 	puts [join [$self icon_set 14] ""]
 
diff --git a/var/mongoose/lib/rsv.class b/var/mongoose/lib/rsv.class
index 814eddf..ad5446d 100755
--- a/var/mongoose/lib/rsv.class
+++ b/var/mongoose/lib/rsv.class
@@ -2,7 +2,7 @@ source /mod/var/mongoose/lib/setup
 
 if {![exists -proc class ]} { package require oo }
 if {![exists -proc sqlite3.open ]} { package require sqlite3 }
-if {![exists -proc settings ]} { require settings.class }
+require settings.class system.class
 
 set rsvdb [sqlite3.open /var/lib/humaxtv/rsv.db]
 $rsvdb query {attach database '/var/lib/humaxtv/channel.db' as channel}
@@ -323,6 +323,7 @@ proc {rsv construct} {event type} {
 	set args(usevtid)		[$event get event_id]
 	set args(szevtname)		"\025[$event get name]"
 	set args(eReady)		30
+	lassign [system padding] args(ulPreOffset) args(ulPostOffset)
 
 	set ccrid [$event get channel_crid]
 
diff --git a/var/mongoose/lib/system.class b/var/mongoose/lib/system.class
index 113a16d..13f237f 100644
--- a/var/mongoose/lib/system.class
+++ b/var/mongoose/lib/system.class
@@ -1,5 +1,6 @@
 
 if {![exists -proc class ]} { package require oo }
+if {![exists -proc sqlite3.open ]} { package require sqlite3 }
 
 class system {}
 
@@ -73,3 +74,22 @@ proc {system restartpending} {} {
 	close [open /tmp/.restartpending w]
 }
 
+proc {system padding} {} {
+	set start 0
+	set stop 0
+	set db [sqlite3.open /var/lib/humaxtv/setup.db]
+	foreach l [$db query "
+		select itemName, itemValue
+		from TBL_MENUCONFIG
+		where itemName in ('START_PADDING_TIME', 'STOP_PADDING_TIME')
+	"] {
+		lassign $l x name x val
+		switch $name {
+		    "START_PADDING_TIME" { set start $val }
+		    "STOP_PADDING_TIME" { set stop $val }
+		}
+	}
+	$db close
+	return [list $start $stop]
+}
+