diff --git a/web/zm_funcs.php b/web/zm_funcs.php
index 321f89735..c6a152da1 100644
--- a/web/zm_funcs.php
+++ b/web/zm_funcs.php
@@ -1015,8 +1015,8 @@ function parseSort( $save_to_session=false, $term_sep='&' )
 
 	if ( !isset($sort_field) )
 	{
-		$sort_field = ZM_EVENT_SORT_FIELD;
-		$sort_asc = (ZM_EVENT_SORT_ORDER == "asc");
+		$sort_field = ZM_WEB_EVENT_SORT_FIELD;
+		$sort_asc = (ZM_WEB_EVENT_SORT_ORDER == "asc");
 	}
 	switch( $sort_field )
 	{
diff --git a/web/zm_html_view_event.php b/web/zm_html_view_event.php
index 3ee47a6c4..a701eb581 100644
--- a/web/zm_html_view_event.php
+++ b/web/zm_html_view_event.php
@@ -373,10 +373,10 @@ if ( $mode == "stream" )
 ?>
 <tr><td align="center" valign="middle">
 <?php
-	if ( ZM_VIDEO_STREAM_METHOD == 'mpeg' && ZM_VIDEO_REPLAY_FORMAT )
+	if ( ZM_STREAM_METHOD == 'mpeg' && ZM_MPEG_REPLAY_FORMAT )
 	{
-		$stream_src = getStreamSrc( array( "mode=mpeg", "event=".$eid, "frame=".(!empty($fid)?$fid:1), "scale=".$scale, "rate=".$rate, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_VIDEO_REPLAY_FORMAT ) );
-		outputVideoStream( $stream_src, reScale( $event['Width'], $scale ), reScale( $event['Height'], $scale ), $event['Name'], ZM_VIDEO_REPLAY_FORMAT );
+		$stream_src = getStreamSrc( array( "mode=mpeg", "event=".$eid, "frame=".(!empty($fid)?$fid:1), "scale=".$scale, "rate=".$rate, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_MPEG_REPLAY_FORMAT ) );
+		outputVideoStream( $stream_src, reScale( $event['Width'], $scale ), reScale( $event['Height'], $scale ), $event['Name'], ZM_MPEG_REPLAY_FORMAT );
 	}
 	else
 	{
@@ -550,7 +550,7 @@ var timeout_id = window.setTimeout( "window.location.replace( '<?= $PHP_SELF ?>?
 	$start_section = 0;
 	if ( !empty($fid) )
 	{
-		$start_section = (int)floor(($fid * $panel_sections)/($event['Frames']+1));
+		$start_section = (int)floor((($fid-1) * $panel_sections)/($event['Frames']+1));
 	}
 	if ( ZM_WEB_SHOW_PROGRESS )
 	{
diff --git a/web/zm_html_view_filter.php b/web/zm_html_view_filter.php
index 86b527406..53ffe3418 100644
--- a/web/zm_html_view_filter.php
+++ b/web/zm_html_view_filter.php
@@ -138,8 +138,8 @@ $sort_dirns = array(
 );
 if ( !$sort_field )
 {
-	$sort_field = ZM_EVENT_SORT_FIELD; 
-	$sort_asc = (ZM_EVENT_SORT_ORDER == "asc");
+	$sort_field = ZM_WEB_EVENT_SORT_FIELD; 
+	$sort_asc = (ZM_WEB_EVENT_SORT_ORDER == "asc");
 }
 
 ?>
diff --git a/web/zm_html_view_montagefeed.php b/web/zm_html_view_montagefeed.php
index 68ef71e9a..0d4f500bc 100644
--- a/web/zm_html_view_montagefeed.php
+++ b/web/zm_html_view_montagefeed.php
@@ -106,10 +106,10 @@ window.setTimeout( "window.location.reload(true)", <?= ZM_WEB_REFRESH_IMAGE*1000
 <?php
 if ( $mode == "stream" )
 {
-	if ( ZM_VIDEO_STREAM_METHOD == 'mpeg' && ZM_VIDEO_LIVE_FORMAT )
+	if ( ZM_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT )
 	{
-		$stream_src = getStreamSrc( array( "mode=mpeg", "monitor=".$monitor['Id'], "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_VIDEO_LIVE_FORMAT ) );
-		outputVideoStream( $stream_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'], ZM_VIDEO_LIVE_FORMAT );
+		$stream_src = getStreamSrc( array( "mode=mpeg", "monitor=".$monitor['Id'], "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_MPEG_LIVE_FORMAT ) );
+		outputVideoStream( $stream_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'], ZM_MPEG_LIVE_FORMAT );
 	}
 	else
 	{
diff --git a/web/zm_html_view_options.php b/web/zm_html_view_options.php
index 79002d16d..5d7095861 100644
--- a/web/zm_html_view_options.php
+++ b/web/zm_html_view_options.php
@@ -28,13 +28,13 @@ $tabs = array();
 $tabs['system'] = $zmSlangSystem;
 $tabs['config'] = $zmSlangConfig;
 $tabs['paths'] = $zmSlangPaths;
-$tabs['network'] = $zmSlangNetwork;
 $tabs['web'] = $zmSlangWeb;
-$tabs['video'] = $zmSlangVideo;
+$tabs['tools'] = $zmSlangTools;
+$tabs['debug'] = $zmSlangDebug;
+$tabs['network'] = $zmSlangNetwork;
 $tabs['mail'] = $zmSlangEmail;
 $tabs['ftp'] = $zmSlangFTP;
 $tabs['x10'] = $zmSlangX10;
-$tabs['tools'] = $zmSlangTools;
 $tabs['highband'] = $zmSlangHighBW;
 $tabs['medband'] = $zmSlangMediumBW;
 $tabs['lowband'] = $zmSlangLowBW;
diff --git a/web/zm_html_view_watchfeed.php b/web/zm_html_view_watchfeed.php
index 0d32d59ec..5145fc86c 100644
--- a/web/zm_html_view_watchfeed.php
+++ b/web/zm_html_view_watchfeed.php
@@ -96,10 +96,10 @@ window.setTimeout( "window.location.reload(true)", <?= ZM_WEB_REFRESH_IMAGE*1000
 <?php
 if ( $mode == "stream" )
 {
-	if ( ZM_VIDEO_STREAM_METHOD == 'mpeg' && ZM_VIDEO_LIVE_FORMAT )
+	if ( ZM_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT )
 	{
-		$stream_src = getStreamSrc( array( "mode=mpeg", "monitor=".$mid, "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_VIDEO_LIVE_FORMAT ) );
-		outputVideoStream( $stream_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'], ZM_VIDEO_LIVE_FORMAT );
+		$stream_src = getStreamSrc( array( "mode=mpeg", "monitor=".$mid, "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_MPEG_LIVE_FORMAT ) );
+		outputVideoStream( $stream_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'], ZM_MPEG_LIVE_FORMAT );
 	}
 	else
 	{
diff --git a/web/zm_lang_en_gb.php b/web/zm_lang_en_gb.php
index 54447c6ac..878fbf4a0 100644
--- a/web/zm_lang_en_gb.php
+++ b/web/zm_lang_en_gb.php
@@ -207,6 +207,7 @@ $zmSlangControlType          = 'Control Type';
 $zmSlangCycle                = 'Cycle';
 $zmSlangCycleWatch           = 'Cycle Watch';
 $zmSlangDay                  = 'Day';
+$zmSlangDebug                = 'Debug';
 $zmSlangDefaultRate          = 'Default Rate';
 $zmSlangDefaultScale         = 'Default Scale';
 $zmSlangDeleteAndNext        = 'Delete &amp; Next';