diff --git a/web/Makefile.am b/web/Makefile.am
index 368a54714..5a1182856 100644
--- a/web/Makefile.am
+++ b/web/Makefile.am
@@ -6,9 +6,9 @@ webdir = @WEB_PREFIX@
 webuser = @WEB_USER@
 webgroup = @WEB_GROUP@
 
-web_DATA = zm_actions.php zm_config.php zm_db.php zm_funcs.php zm_html.php zm_html_view_bandwidth.php zm_html_view_function.php zm_html_view_none.php zm_html_view_video.php zm_html_view_console.php zm_html_view_image.php zm_html_view_optionhelp.php zm_html_view_watchevents.php zm_html_view_cycle.php zm_html_view_login.php zm_html_view_options.php zm_html_view_watchfeed.php zm_html_view_error.php zm_html_view_logout.php zm_html_view_postlogin.php zm_html_view_watch.php zm_html_view_event.php zm_html_view_monitor.php zm_html_view_restarting.php zm_html_view_watchstatus.php zm_html_view_events.php zm_html_view_montagefeed.php zm_html_view_settings.php zm_html_view_zone.php zm_html_view_filter.php zm_html_view_montage.php zm_html_view_stats.php zm_html_view_zones.php zm_html_view_filtersave.php zm_html_view_montagestatus.php zm_html_view_user.php zm.php zm_styles.css zm_wml.php zm_wml_view_console.php zm_wml_view_feed.php
+web_DATA = zm_actions.php zm_config.php zm_db.php zm_funcs.php zm_html.php zm_html_view_bandwidth.php zm_html_view_function.php zm_html_view_none.php zm_html_view_video.php zm_html_view_console.php zm_html_view_image.php zm_html_view_optionhelp.php zm_html_view_watchevents.php zm_html_view_cycle.php zm_html_view_login.php zm_html_view_options.php zm_html_view_watchfeed.php zm_html_view_error.php zm_html_view_logout.php zm_html_view_postlogin.php zm_html_view_watch.php zm_html_view_event.php zm_html_view_monitor.php zm_html_view_restarting.php zm_html_view_watchstatus.php zm_html_view_events.php zm_html_view_montagefeed.php zm_html_view_settings.php zm_html_view_zone.php zm_html_view_filter.php zm_html_view_montage.php zm_html_view_frames.php zm_html_view_stats.php zm_html_view_zones.php zm_html_view_filtersave.php zm_html_view_montagestatus.php zm_html_view_user.php zm.php zm_styles.css zm_wml.php zm_wml_view_console.php zm_wml_view_feed.php
 
-EXTRA_DIST = zm_config.php.z zm_actions.php zm_db.php zm_funcs.php zm_html.php zm_html_view_bandwidth.php zm_html_view_function.php zm_html_view_none.php zm_html_view_video.php zm_html_view_console.php zm_html_view_image.php zm_html_view_optionhelp.php zm_html_view_watchevents.php zm_html_view_cycle.php zm_html_view_login.php zm_html_view_options.php zm_html_view_watchfeed.php zm_html_view_error.php zm_html_view_logout.php zm_html_view_postlogin.php zm_html_view_watch.php zm_html_view_event.php zm_html_view_monitor.php zm_html_view_restarting.php zm_html_view_watchstatus.php zm_html_view_events.php zm_html_view_montagefeed.php zm_html_view_settings.php zm_html_view_zone.php zm_html_view_filter.php zm_html_view_montage.php zm_html_view_stats.php zm_html_view_zones.php zm_html_view_filtersave.php zm_html_view_montagestatus.php zm_html_view_user.php zm.php zm_styles.css zm_wml.php zm_wml_view_console.php zm_wml_view_feed.php swap.pl retag.sh
+EXTRA_DIST = zm_config.php.z zm_actions.php zm_db.php zm_funcs.php zm_html.php zm_html_view_bandwidth.php zm_html_view_function.php zm_html_view_none.php zm_html_view_video.php zm_html_view_console.php zm_html_view_image.php zm_html_view_optionhelp.php zm_html_view_watchevents.php zm_html_view_cycle.php zm_html_view_login.php zm_html_view_options.php zm_html_view_watchfeed.php zm_html_view_error.php zm_html_view_logout.php zm_html_view_postlogin.php zm_html_view_watch.php zm_html_view_event.php zm_html_view_monitor.php zm_html_view_restarting.php zm_html_view_watchstatus.php zm_html_view_events.php zm_html_view_montagefeed.php zm_html_view_settings.php zm_html_view_zone.php zm_html_view_filter.php zm_html_view_montage.php zm_html_view_frames.php zm_html_view_stats.php zm_html_view_zones.php zm_html_view_filtersave.php zm_html_view_montagestatus.php zm_html_view_user.php zm.php zm_styles.css zm_wml.php zm_wml_view_console.php zm_wml_view_feed.php swap.pl retag.sh
 
 # Yes, you are correct. This is a HACK!
 install-data-hook:
diff --git a/web/Makefile.in b/web/Makefile.in
index da06ea39d..f93a1ace8 100644
--- a/web/Makefile.in
+++ b/web/Makefile.in
@@ -123,9 +123,9 @@ webdir = @WEB_PREFIX@
 webuser = @WEB_USER@
 webgroup = @WEB_GROUP@
 
-web_DATA = zm_actions.php zm_config.php zm_db.php zm_funcs.php zm_html.php zm_html_view_bandwidth.php zm_html_view_function.php zm_html_view_none.php zm_html_view_video.php zm_html_view_console.php zm_html_view_image.php zm_html_view_optionhelp.php zm_html_view_watchevents.php zm_html_view_cycle.php zm_html_view_login.php zm_html_view_options.php zm_html_view_watchfeed.php zm_html_view_error.php zm_html_view_logout.php zm_html_view_postlogin.php zm_html_view_watch.php zm_html_view_event.php zm_html_view_monitor.php zm_html_view_restarting.php zm_html_view_watchstatus.php zm_html_view_events.php zm_html_view_montagefeed.php zm_html_view_settings.php zm_html_view_zone.php zm_html_view_filter.php zm_html_view_montage.php zm_html_view_stats.php zm_html_view_zones.php zm_html_view_filtersave.php zm_html_view_montagestatus.php zm_html_view_user.php zm.php zm_styles.css zm_wml.php zm_wml_view_console.php zm_wml_view_feed.php
+web_DATA = zm_actions.php zm_config.php zm_db.php zm_funcs.php zm_html.php zm_html_view_bandwidth.php zm_html_view_function.php zm_html_view_none.php zm_html_view_video.php zm_html_view_console.php zm_html_view_image.php zm_html_view_optionhelp.php zm_html_view_watchevents.php zm_html_view_cycle.php zm_html_view_login.php zm_html_view_options.php zm_html_view_watchfeed.php zm_html_view_error.php zm_html_view_logout.php zm_html_view_postlogin.php zm_html_view_watch.php zm_html_view_event.php zm_html_view_monitor.php zm_html_view_restarting.php zm_html_view_watchstatus.php zm_html_view_events.php zm_html_view_montagefeed.php zm_html_view_settings.php zm_html_view_zone.php zm_html_view_filter.php zm_html_view_montage.php zm_html_view_frames.php zm_html_view_stats.php zm_html_view_zones.php zm_html_view_filtersave.php zm_html_view_montagestatus.php zm_html_view_user.php zm.php zm_styles.css zm_wml.php zm_wml_view_console.php zm_wml_view_feed.php
 
-EXTRA_DIST = zm_config.php.z zm_actions.php zm_db.php zm_funcs.php zm_html.php zm_html_view_bandwidth.php zm_html_view_function.php zm_html_view_none.php zm_html_view_video.php zm_html_view_console.php zm_html_view_image.php zm_html_view_optionhelp.php zm_html_view_watchevents.php zm_html_view_cycle.php zm_html_view_login.php zm_html_view_options.php zm_html_view_watchfeed.php zm_html_view_error.php zm_html_view_logout.php zm_html_view_postlogin.php zm_html_view_watch.php zm_html_view_event.php zm_html_view_monitor.php zm_html_view_restarting.php zm_html_view_watchstatus.php zm_html_view_events.php zm_html_view_montagefeed.php zm_html_view_settings.php zm_html_view_zone.php zm_html_view_filter.php zm_html_view_montage.php zm_html_view_stats.php zm_html_view_zones.php zm_html_view_filtersave.php zm_html_view_montagestatus.php zm_html_view_user.php zm.php zm_styles.css zm_wml.php zm_wml_view_console.php zm_wml_view_feed.php swap.pl retag.sh
+EXTRA_DIST = zm_config.php.z zm_actions.php zm_db.php zm_funcs.php zm_html.php zm_html_view_bandwidth.php zm_html_view_function.php zm_html_view_none.php zm_html_view_video.php zm_html_view_console.php zm_html_view_image.php zm_html_view_optionhelp.php zm_html_view_watchevents.php zm_html_view_cycle.php zm_html_view_login.php zm_html_view_options.php zm_html_view_watchfeed.php zm_html_view_error.php zm_html_view_logout.php zm_html_view_postlogin.php zm_html_view_watch.php zm_html_view_event.php zm_html_view_monitor.php zm_html_view_restarting.php zm_html_view_watchstatus.php zm_html_view_events.php zm_html_view_montagefeed.php zm_html_view_settings.php zm_html_view_zone.php zm_html_view_filter.php zm_html_view_montage.php zm_html_view_frames.php zm_html_view_stats.php zm_html_view_zones.php zm_html_view_filtersave.php zm_html_view_montagestatus.php zm_html_view_user.php zm.php zm_styles.css zm_wml.php zm_wml_view_console.php zm_wml_view_feed.php swap.pl retag.sh
 subdir = web
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/web/zm_config.php.z b/web/zm_config.php.z
index 5076a2c1c..90d248fd0 100644
--- a/web/zm_config.php.z
+++ b/web/zm_config.php.z
@@ -156,7 +156,8 @@ $jws = array(
 	'zone' => array( 'w'=>360, 'h'=>480 ),
 	'video' => array( 'w'=>100, 'h'=>80 ),
 	'image' => array( 'w'=>48, 'h'=>80 ),
-	'stats' => array( 'w'=>600, 'h'=>150 ),
+	'frames' => array( 'w'=>500, 'h'=>300 ),
+	'stats' => array( 'w'=>600, 'h'=>200 ),
 	'options' => array( 'w'=>760, 'h'=>440 ),
 	'optionhelp' => array( 'w'=>320, 'h'=>240 ),
 	'restarting' => array( 'w'=>250, 'h'=>150 ),
diff --git a/web/zm_html.php b/web/zm_html.php
index ae2d43ee6..21cafff35 100644
--- a/web/zm_html.php
+++ b/web/zm_html.php
@@ -87,6 +87,7 @@ switch( $view )
 	case "filtersave" :
 	case "event" :
 	case "image" :
+	case "frames" :
 	case "stats" :
 	case "monitor" :
 	case "zones" :
diff --git a/web/zm_html_view_frames.php b/web/zm_html_view_frames.php
new file mode 100644
index 000000000..a281e6fd0
--- /dev/null
+++ b/web/zm_html_view_frames.php
@@ -0,0 +1,86 @@
+<?php
+	if ( !canView( 'Events' ) )
+	{
+		$view = "error";
+		return;
+	}
+	$result = mysql_query( "select F.*,unix_timestamp(F.TimeStamp) as UnixTimeStamp,E.*,M.Name as MonitorName,M.Width,M.Height from Frames as F left join Events as E on F.EventId = E.Id left join Monitors as M on E.MonitorId = M.Id where F.EventId = '$eid' order by F.FrameId" );
+	if ( !$result )
+		die( mysql_error() );
+	while ( $row = mysql_fetch_assoc( $result ) )
+	{
+		$frames[] = $row;
+	}
+?>
+<html>
+<head>
+<title>ZM - Frames <?= $eid ?></title>
+<link rel="stylesheet" href="zm_styles.css" type="text/css">
+<script language="JavaScript">
+window.focus();
+function newWindow(Url,Name,Width,Height)
+{
+   	var Name = window.open(Url,Name,"resizable,scrollbars,width="+Width+",height="+Height);
+}
+function closeWindow()
+{
+	window.close();
+}
+</script>
+</head>
+<body>
+<table width="96%" border="0">
+<tr>
+<td align="left" class="smallhead"><b>Event <?= $eid ?></b></td>
+<td align="right" class="text"><a href="javascript: closeWindow();">Close</a></td>
+</tr>
+<tr><td colspan="2"><table width="100%" border="0" bgcolor="#7F7FB2" cellpadding="3" cellspacing="1"><tr bgcolor="#FFFFFF">
+<td class="smallhead" align="center">Frame Id</td>
+<td class="smallhead" align="center">Alarm Frame</td>
+<td class="smallhead" align="center">Time Stamp</td>
+<td class="smallhead" align="center">Time Delta</td>
+<td class="smallhead" align="center">Score</td>
+</tr>
+<?php
+	if ( count($frames) )
+	{
+		foreach ( $frames as $frame )
+		{
+?>
+<tr bgcolor="<?= $frame[AlarmFrame]?'#FF6347':'#FFFFFF' ?>">
+<td class="text" align="center"><?= $frame[FrameId] ?></td>
+<td class="text" align="center"><?= $frame[AlarmFrame]?"yes":"no" ?></td>
+<td class="text" align="center"><?= date( "H:i:s", $frame[UnixTimeStamp] ) ?></td>
+<td class="text" align="center"><?= number_format( $frame[Delta], 2 ) ?></td>
+<?php
+			if ( ZM_RECORD_EVENT_STATS && $frame[AlarmFrame] )
+			{
+?>
+<td class="text" align="center"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=stats&eid=<?= $eid ?>&fid=<?= $frame[FrameId] ?>', 'zmStats', <?= $jws['stats']['w'] ?>, <?= $jws['stats']['h'] ?> );"><?= $frame[Score] ?></a></td>
+<?php
+			}
+			else
+			{
+?> 
+<td class="text" align="center"><?= $frame[Score] ?></td>
+<?php
+			}
+?> 
+</tr>
+<?php
+		}
+	}
+	else
+	{
+?>
+<tr bgcolor="#FFFFFF">
+<td class="text" colspan="8" align="center"><br>There are no frames recorded for this event<br><br></td>
+</tr>
+<?php
+	}
+?>
+</table></td>
+</tr>
+</table>
+</body>
+</html>
diff --git a/web/zm_html_view_stats.php b/web/zm_html_view_stats.php
index e7487eb63..f2f597af4 100644
--- a/web/zm_html_view_stats.php
+++ b/web/zm_html_view_stats.php
@@ -27,7 +27,7 @@ function closeWindow()
 <body>
 <table width="96%" border="0">
 <tr>
-<td align="left" class="smallhead"><b>Image <?= $eid."-".$fid ?></b></td>
+<td align="left" class="smallhead"><b>Frame <?= $eid."-".$fid ?></b></td>
 <td align="right" class="text"><a href="javascript: closeWindow();">Close</a></td>
 </tr>
 <tr><td colspan="2"><table width="100%" border="0" bgcolor="#7F7FB2" cellpadding="3" cellspacing="1"><tr bgcolor="#FFFFFF">
diff --git a/web/zm_html_view_watchevents.php b/web/zm_html_view_watchevents.php
index 7580d4abc..6936aadd7 100644
--- a/web/zm_html_view_watchevents.php
+++ b/web/zm_html_view_watchevents.php
@@ -136,7 +136,7 @@ window.setTimeout( "window.location.replace( '<?= "$PHP_SELF?view=watchevents&mi
 <td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=event&mid=<?= $mid ?>&eid=<?= $row[Id] ?>', 'zmEvent', <?= $jws['event']['w'] ?>, <?= $jws['event']['h'] ?> );"><?= $row[Name] ?></a></td>
 <td align="center" class="text"><?= strftime( "%m/%d %H:%M:%S", strtotime($row[StartTime]) ) ?></td>
 <td align="center" class="text"><?= $row[Length] ?></td>
-<td align="center" class="text"><?= $row[Frames] ?>/<?= $row[AlarmFrames] ?></td>
+<td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=frames&mid=<?= $mid ?>&eid=<?= $row[Id] ?>', 'zmFrames', <?= $jws['frames']['w'] ?>, <?= $jws['frames']['h'] ?> );"><?= $row[Frames] ?>/<?= $row[AlarmFrames] ?></a></td>
 <td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=image&eid=<?= $row[Id] ?>&fid=0', 'zmImage', <?= $monitor[Width]+$jws['image']['w'] ?>, <?= $monitor[Height]+$jws['image']['h'] ?> );"><?= $row[AvgScore] ?>/<?= $row[MaxScore] ?></a></td>
 <td align="center" class="text"><input type="checkbox" name="mark_eids[]" value="<?= $row[Id] ?>" onClick="configureButton( document.event_form, 'mark_eids' );"<?php if ( !canEdit( 'Events' ) ) { ?> disabled<?php } ?>></td>
 </tr>