diff --git a/Source/Source.ViewAPI.php b/Source/Source.ViewAPI.php
new file mode 100644
index 0000000..f986abe
--- /dev/null
+++ b/Source/Source.ViewAPI.php
@@ -0,0 +1,69 @@
+<?php
+# Copyright (C) 2008	John Reese
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+/**
+ * Display a list of changeset objects in tabular format.
+ * Assumes that a table with four columns has already been defined.
+ * @param array Changeset objects
+ * @param array Repository objects
+ */
+function Source_View_Changesets( $p_changesets, $p_repos=null, $p_show_repos=true ) {
+	if ( !is_array( $p_changesets ) ) {
+		return;
+	}
+
+	if ( is_null( $p_repos ) || !is_array( $p_repos ) ) {
+		$t_repos = SourceRepo::load_by_changesets( $p_changesets );
+	}
+
+	foreach( $p_changesets as $t_changeset ) {
+		$t_repo = $p_repos[ $t_changeset->repo_id ];
+		$t_changeset->load_files();
+		?>
+
+<tr class="row-1">
+<td class="category" width="25%" rowspan="<?php echo count( $t_changeset->files ) + 1 ?>">
+	<?php echo string_display(
+		( $p_show_repos ? $t_repo->name . ': ' : '' ) .
+		event_signal( 'EVENT_SOURCE_SHOW_CHANGESET', array( $t_repo, $t_changeset ) )
+		) ?>
+	<br/><span class="small"><?php echo plugin_lang_get( 'timestamp', 'Source' ), ': ', string_display_line( $t_changeset->timestamp ) ?></span>
+	<br/><span class="small"><?php echo plugin_lang_get( 'author', 'Source' ), ': ', string_display_line( $t_changeset->author ) ?></span>
+	<br/><span class="small-links">
+		<?php
+		print_bracket_link( plugin_page( 'view', false, 'Source' ) . '&id=' . $t_changeset->id, plugin_lang_get( 'details', 'Source' ) );
+		?>
+</td>
+<td colspan="3"><?php echo string_display_links( $t_changeset->message ) ?></td>
+</tr>
+
+		<?php foreach ( $t_changeset->files as $t_file ) { ?>
+<tr class="row-2">
+<td colspan="2"><?php echo string_display_line( event_signal( 'EVENT_SOURCE_SHOW_FILE', array( $t_repo, $t_changeset, $t_file ) ) ) ?></td>
+<td class="center" width="15%">
+		<?php
+		if ( $t_url = event_signal( 'EVENT_SOURCE_URL_FILE_DIFF', array( $t_repo, $t_changeset, $t_file ) ) ) {
+			print_bracket_link( $t_url, plugin_lang_get( 'diff', 'Source' ) );
+		}
+		if ( $t_url = event_signal( 'EVENT_SOURCE_URL_FILE', array( $t_repo, $t_changeset, $t_file ) ) ) {
+			print_bracket_link( $t_url, plugin_lang_get( 'file', 'Source' ) );
+		}
+		?>
+</td>
+</tr>
+		<?php } ?>
+<tr><td class="spacer"></td></tr>
+		<?php
+	}
+}
+
diff --git a/Source/SourceIntegration.php b/Source/SourceIntegration.php
index f7b0303..088ec39 100644
--- a/Source/SourceIntegration.php
+++ b/Source/SourceIntegration.php
@@ -33,6 +33,8 @@
 	}
 
 	function display_bug( $p_event, $p_bug_id ) {
+		require_once( 'Source.ViewAPI.php' );
+
 		if ( !access_has_global_level( config_get( 'plugin_Source_view_threshold' ) ) ) {
 			return;
 		}
@@ -52,45 +54,7 @@
 <tr>
 	<td class="form-title"><?php collapse_icon( 'Source' ); echo plugin_lang_get( 'related_changesets', 'Source' ) ?></td>
 </tr>
-
-		<?php
-		foreach ( $t_changesets as $t_changeset ) {
-			$t_repo = $t_repos[$t_changeset->repo_id];
-			$t_css = helper_alternate_class();
-			?>
-
-<tr class="row-1">
-<td class="category" width="25%" rowspan="<?php echo count( $t_changeset->files ) + 1 ?>">
-	<?php echo string_display( $t_repo->name . ': ' . event_signal( 'EVENT_SOURCE_SHOW_CHANGESET', array( $t_repo, $t_changeset ) ) ) ?>
-	<br/><span class="small"><?php echo plugin_lang_get( 'timestamp', 'Source' ), ': ', string_display_line( $t_changeset->timestamp ) ?></span>
-	<br/><span class="small"><?php echo plugin_lang_get( 'author', 'Source' ), ': ', string_display_line( $t_changeset->author ) ?></span>
-	<br/><span class="small-links">
-		<?php
-			print_bracket_link( plugin_page( 'view', false, 'Source' ) . '&id=' . $t_changeset->id, plugin_lang_get( 'details', 'Source' ) );
-		?>
-</td>
-<td colspan="2"><?php echo string_display_links( $t_changeset->message ) ?></td>
-</tr>
-
-		<?php foreach ( $t_changeset->files as $t_file ) { ?>
-<tr class="row-2">
-<td><?php echo string_display_line( event_signal( 'EVENT_SOURCE_SHOW_FILE', array( $t_repo, $t_changeset, $t_file ) ) ) ?></td>
-<td class="center" width="15%">
-	<?php
-		if ( $t_url = event_signal( 'EVENT_SOURCE_URL_FILE_DIFF', array( $t_repo, $t_changeset, $t_file ) ) ) {
-			print_bracket_link( $t_url, plugin_lang_get( 'diff', 'Source' ) );
-		}
-		if ( $t_url = event_signal( 'EVENT_SOURCE_URL_FILE', array( $t_repo, $t_changeset, $t_file ) ) ) {
-			print_bracket_link( $t_url, plugin_lang_get( 'file', 'Source' ) );
-		}
-	?>
-</td>
-</tr>
-		<?php } ?>
-
-<tr><td class="spacer"></td></tr>
-
-		<?php } ?>
+		<?php Source_View_Changesets( $t_changesets, $t_repos ); ?>
 </table>
 <?php
 			collapse_closed( 'Source' );
diff --git a/Source/pages/list.php b/Source/pages/list.php
index c6d6233..ee1497d 100644
--- a/Source/pages/list.php
+++ b/Source/pages/list.php
@@ -11,6 +11,8 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+require_once( config_get( 'plugin_path' ) . 'Source/Source.ViewAPI.php' );
+
 access_ensure_global_level( plugin_config_get( 'view_threshold' ) );
 
 $f_repo_id = gpc_get_int( 'id' );
@@ -45,53 +47,7 @@
 </td>
 <tr>
 
-<?php /*
-<tr class="row-category">
-<td><?php echo "Changeset" ?></td>
-<td><?php echo "Author" ?></td>
-<td colspan="2"><?php echo "Message" ?></td>
-</tr>
- */ ?>
-
-<?php
-foreach( $t_changesets as $t_changeset ) {
-	$t_rows = count( $t_changeset->files ) + 1;
-?>
-<tr class="row-1">
-<td class="category" width="25%" rowspan="<?php echo $t_rows ?>">
-	<strong><?php echo event_signal( 'EVENT_SOURCE_SHOW_CHANGESET', array( $t_repo, $t_changeset ) ) ?></strong><br/>
-	<span class="small"><?php echo "Timestamp: ", $t_changeset->timestamp ?></span><br/>
-	<span class="small"><?php echo "Author: ", $t_changeset->author ?></span><br/>
-	<span class="small-links">
-		<?php
-			print_bracket_link( plugin_page( 'view', false, 'Source' ) . '&id=' . $t_changeset->id, plugin_lang_get( 'details', 'Source' ) );
-		?>
-	</span>
-</td>
-<td colspan="3"><?php echo string_display_links( $t_changeset->message ) ?></td>
-</tr>
-
-<?php foreach ( $t_changeset->files as $t_file ) { ?>
-
-<tr class="row-2">
-<td colspan="2"><?php echo string_display_line( event_signal( 'EVENT_SOURCE_SHOW_FILE', array( $t_repo, $t_changeset, $t_file ) ) ) ?></td>
-<td class="center" width="15%">
-	<?php
-		if ( $t_url = event_signal( 'EVENT_SOURCE_URL_FILE_DIFF', array( $t_repo, $t_changeset, $t_file ) ) ) {
-			print_bracket_link( $t_url, plugin_lang_get( 'diff', 'Source' ) );
-		}
-		if ( $t_url = event_signal( 'EVENT_SOURCE_URL_FILE', array( $t_repo, $t_changeset, $t_file ) ) ) {
-			print_bracket_link( $t_url, plugin_lang_get( 'file', 'Source' ) );
-		}
-	?>
-</td>
-</tr>
-
-<?php } ?>
-
-<tr><td class="spacer"></td></tr>
-
-<?php } ?>
+<?php Source_View_Changesets( $t_changesets, array( $t_repo->id => $t_repo ), false ) ?>
 
 <tr>
 <td colspan="4" class="center">
diff --git a/Source/pages/search.php b/Source/pages/search.php
index 2b4c6b1..2719d8f 100644
--- a/Source/pages/search.php
+++ b/Source/pages/search.php
@@ -11,6 +11,8 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+require_once( config_get( 'plugin_path' ) . 'Source/Source.ViewAPI.php' );
+
 access_ensure_global_level( plugin_config_get( 'view_threshold' ) );
 
 $f_offset = gpc_get_int( 'offset', 1 );
@@ -32,7 +34,7 @@
 <table class="width100" align="center" cellspacing="1">
 
 <tr>
-<td class="form-title"><?php echo plugin_lang_get( 'search' ), ' ', plugin_lang_get( 'changesets' ) ?></td>
+<td class="form-title" colspan="2"><?php echo plugin_lang_get( 'search' ), ' ', plugin_lang_get( 'changesets' ) ?></td>
 <td class="right" colspan="2">
 <?php
 print_bracket_link( plugin_page( 'search' ) . $t_permalink, plugin_lang_get( 'permalink' ) );
@@ -43,38 +45,7 @@
 </td>
 </tr>
 
-<?php
-foreach( $t_changesets as $t_changeset ) {
-	$t_changeset->load_files();
-	$t_changeset->load_bugs();
-	$t_repo = $t_repos[ $t_changeset->repo_id ];
-	$t_rows = count( $t_changeset->files ) + 1;
-?>
-
-<tr class="row-1">
-<td class="category" width="25%" rowspan="<?php echo $t_rows ?>">
-	<strong><?php echo string_display( $t_repo->name ), ' ', event_signal( 'EVENT_SOURCE_SHOW_CHANGESET', array( $t_repo, $t_changeset ) ) ?></strong><br/>
-	<span class="small"><?php echo plugin_lang_get( 'timestamp' ), ': ', $t_changeset->timestamp ?></span><br/>
-	<span class="small"><?php echo plugin_lang_get( 'author' ), ': ', $t_changeset->author ?></span>
-</td>
-<td colspan="2"><?php echo string_display_links( $t_changeset->message ) ?></td>
-</tr>
-
-<?php foreach ( $t_changeset->files as $t_file ) { ?>
-
-<tr class="row-2">
-<td><?php echo string_display_line( event_signal( 'EVENT_SOURCE_SHOW_FILE', array( $t_repo, $t_changeset, $t_file ) ) ) ?></td>
-<td class="center" width="15%">
-	<?php print_bracket_link( event_signal( 'EVENT_SOURCE_URL_FILE_DIFF', array( $t_repo, $t_changeset, $t_file ) ), plugin_lang_get( 'diff', 'Source' ) ) ?>
-	<?php print_bracket_link( event_signal( 'EVENT_SOURCE_URL_FILE', array( $t_repo, $t_changeset, $t_file ) ), plugin_lang_get( 'file', 'Source' ) ) ?>
-</td>
-</tr>
-
-<?php } ?>
-
-<tr><td class="spacer"></td></tr>
-
-<?php } ?>
+<?php Source_View_Changesets( $t_changesets, $t_repos ) ?>
 
 <tr>
 <td colspan="3" class="center">