diff --git a/web/skins/classic/views/events.php b/web/skins/classic/views/events.php
index 3946da2db..defc75272 100644
--- a/web/skins/classic/views/events.php
+++ b/web/skins/classic/views/events.php
@@ -24,6 +24,8 @@ if ( !canView( 'Events' ) || (!empty($_REQUEST['execute']) && !canEdit('Events')
     return;
 }
 
+require_once( 'includes/Event.php' );
+
 if ( !empty($_REQUEST['execute']) )
 {
     executeFilter( $tempFilterName );
@@ -93,17 +95,17 @@ $maxHeight = 0;
 $archived = false;
 $unarchived = false;
 $events = array();
-foreach ( dbFetchAll( $eventsSql ) as $event )
+foreach ( dbFetchAll( $eventsSql ) as $event_row )
 {
-    $events[] = new Event( $event );
+    $events[] = $event = new Event( $event_row );
 
    # Doesn this code do anything? 
     $scale = max( reScale( SCALE_BASE, $event->DefaultScale(), ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
-    $eventWidth = reScale( $event['Width'], $scale );
-    $eventHeight = reScale( $event['Height'], $scale );
+    $eventWidth = reScale( $event_row['Width'], $scale );
+    $eventHeight = reScale( $event_row['Height'], $scale );
     if ( $maxWidth < $eventWidth ) $maxWidth = $eventWidth;
     if ( $maxHeight < $eventHeight ) $maxHeight = $eventHeight;
-    if ( $event['Archived'] )
+    if ( $event_row['Archived'] )
         $archived = true;
     else
         $unarchived = true;
@@ -220,10 +222,10 @@ foreach ( $events as $event )
 		}
     if ( ZM_WEB_LIST_THUMBS )
     {
-        if ( $thumbData = createListThumbnail( $event ) )
+        if ( $thumbData = $event->createListThumbnail() )
         {
 ?>
-              <td class="colThumbnail"><?php echo makePopupLink( '?view=frame&amp;eid='.$event->Id().'&amp;fid='.$thumbData['FrameId'], 'zmImage', array( 'image', reScale( $event->Width(), $scale ), reScale( $event->Height(), $scale ) ), '<img src="'.viewImagePath( $thumbData['Path'] ).'" width="'.$thumbData['Width'].'" height="'.$thumbData['Height'].'" alt="'.$thumbData['FrameId'].'/'.$event->MaxScore().'"/>' ) ?></td>
+              <td class="colThumbnail"><?php echo makePopupLink( '?view=frame&amp;eid='.$event->Id().'&amp;fid='.$thumbData['FrameId'], 'zmImage', array( 'image', reScale( $event->Width(), $scale ), reScale( $event->Height(), $scale ) ), '<img src="?view=image&amp;eid='.$event->Id().'&amp;fid='.$thumbData['FrameId'].'&amp;width='.$thumbData['Width'].'&amp;height='.$thumbData['Height'].'" width="'.$thumbData['Width'].'" height="'.$thumbData['Height'].'" alt="'.$thumbData['FrameId'].'/'.$event->MaxScore().'"/>' ) ?></td>
 <?php
         }
         else