diff --git a/Source/MantisSourcePlugin.class.php b/Source/MantisSourcePlugin.class.php
index ca8ec53..2ee523b 100644
--- a/Source/MantisSourcePlugin.class.php
+++ b/Source/MantisSourcePlugin.class.php
@@ -35,7 +35,7 @@
 			'EVENT_SOURCE_PRECOMMIT'		=> 'precommit',
 			'EVENT_SOURCE_COMMIT'			=> 'commit',
 
-			'EVENT_SOURCE_IMPORT_REPO'		=> 'import_repo',
+			'EVENT_SOURCE_IMPORT_FULL'		=> 'import_full',
 			'EVENT_SOURCE_IMPORT_LATEST'	=> 'import_latest',
 		);
 	}
@@ -57,7 +57,7 @@
 	function precommit( $p_event ) {}
 	function commit( $p_event, $p_repo, $p_data ) {}
 
-	function import_repo( $p_event, $p_repo ) {}
+	function import_full( $p_event, $p_repo ) {}
 	function import_latest( $p_event, $p_repo )	{}
 }
 
diff --git a/Source/Source.php b/Source/Source.php
index 1c1d8b4..78b7468 100644
--- a/Source/Source.php
+++ b/Source/Source.php
@@ -65,7 +65,7 @@
 			'EVENT_SOURCE_PRECOMMIT'		=> EVENT_TYPE_FIRST,	# Allow plugins to try finding commit information before Source looks
 			'EVENT_SOURCE_COMMIT'			=> EVENT_TYPE_FIRST,	# Source control commit handling, passed commit details from checkin script
 
-			'EVENT_SOURCE_IMPORT_REPO'		=> EVENT_TYPE_FIRST,	# Import an existing repository from scratch
+			'EVENT_SOURCE_IMPORT_FULL'		=> EVENT_TYPE_FIRST,	# Import an existing repository from scratch
 			'EVENT_SOURCE_IMPORT_LATEST'	=> EVENT_TYPE_FIRST,	# Import the latest changesets from a repository
 		);
 	}
diff --git a/Source/lang/strings_english.txt b/Source/lang/strings_english.txt
index 7653380..15fbd59 100644
--- a/Source/lang/strings_english.txt
+++ b/Source/lang/strings_english.txt
@@ -44,7 +44,8 @@
 $s_plugin_Source_select_one = '(Select one)';
 
 $s_plugin_Source_back = 'Back to Index';
-$s_plugin_Source_import_data = 'Import Data';
+$s_plugin_Source_import_full = 'Import Everything';
+$s_plugin_Source_import_latest = 'Import Latest Data';
 $s_plugin_Source_related_changesets = 'Related Changesets';
 
 $s_plugin_Source_configuration = 'Configuration';
diff --git a/Source/pages/repo_import.php b/Source/pages/repo_import.php
deleted file mode 100644
index fb4fffc..0000000
--- a/Source/pages/repo_import.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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.
-
-access_ensure_global_level( plugin_config_get( 'manage_threshold' ) );
-
-$f_repo_id = gpc_get_string( 'id' );
-
-$t_repo = SourceRepo::load( $f_repo_id );
-
-helper_ensure_confirmed( plugin_lang_get( 'ensure_import' ), plugin_lang_get( 'import_data' ) );
-helper_begin_long_process();
-
-html_page_top1();
-html_page_top2();
-
-$t_new_repo = SourceRepo::load( $f_repo_id );
-$t_new_repo->id = 0;
-$t_new_repo->name = 'Import ' . date( 'Y-m-d H:i:s' );
-$t_new_repo->save();
-
-$t_status = event_signal( 'EVENT_SOURCE_IMPORT_REPO', array( $t_new_repo ) );
-
-if ( $t_status ) {
-	$t_new_repo->name = $t_repo->name;
-	$t_new_repo->save();
-
-	SourceRepo::delete( $t_repo->id );
-
-	echo '<br/><div class="center">';
-	print_bracket_link( plugin_page( 'repo_manage_page' ) . '&id=' . $t_new_repo->id, 'Return To Repository' );
-	echo '</div>';
-
-} else {
-	SourceRepo::delete( $t_new_repo->id );
-
-	echo '<br/><div class="center">';
-	print_bracket_link( plugin_page( 'repo_manage_page' ) . '&id=' . $t_repo->id, 'Return To Repository' );
-	echo '</div>';
-}
-
-html_page_bottom1();
-
diff --git a/Source/pages/repo_import_full.php b/Source/pages/repo_import_full.php
new file mode 100644
index 0000000..fb4fffc
--- /dev/null
+++ b/Source/pages/repo_import_full.php
@@ -0,0 +1,52 @@
+<?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.
+
+access_ensure_global_level( plugin_config_get( 'manage_threshold' ) );
+
+$f_repo_id = gpc_get_string( 'id' );
+
+$t_repo = SourceRepo::load( $f_repo_id );
+
+helper_ensure_confirmed( plugin_lang_get( 'ensure_import' ), plugin_lang_get( 'import_data' ) );
+helper_begin_long_process();
+
+html_page_top1();
+html_page_top2();
+
+$t_new_repo = SourceRepo::load( $f_repo_id );
+$t_new_repo->id = 0;
+$t_new_repo->name = 'Import ' . date( 'Y-m-d H:i:s' );
+$t_new_repo->save();
+
+$t_status = event_signal( 'EVENT_SOURCE_IMPORT_REPO', array( $t_new_repo ) );
+
+if ( $t_status ) {
+	$t_new_repo->name = $t_repo->name;
+	$t_new_repo->save();
+
+	SourceRepo::delete( $t_repo->id );
+
+	echo '<br/><div class="center">';
+	print_bracket_link( plugin_page( 'repo_manage_page' ) . '&id=' . $t_new_repo->id, 'Return To Repository' );
+	echo '</div>';
+
+} else {
+	SourceRepo::delete( $t_new_repo->id );
+
+	echo '<br/><div class="center">';
+	print_bracket_link( plugin_page( 'repo_manage_page' ) . '&id=' . $t_repo->id, 'Return To Repository' );
+	echo '</div>';
+}
+
+html_page_bottom1();
+
diff --git a/Source/pages/repo_import_latest.php b/Source/pages/repo_import_latest.php
new file mode 100644
index 0000000..dc493ac
--- /dev/null
+++ b/Source/pages/repo_import_latest.php
@@ -0,0 +1,14 @@
+<?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.
+
+# TODO: Implement cron-able usage similar to checkin.php?
diff --git a/Source/pages/repo_manage_page.php b/Source/pages/repo_manage_page.php
index 817494f..4910607 100644
--- a/Source/pages/repo_manage_page.php
+++ b/Source/pages/repo_manage_page.php
@@ -23,7 +23,7 @@
 ?>
 
 <br/>
-<table class="width50" align="center" cellspacing="1">
+<table class="width75" align="center" cellspacing="1">
 
 <tr>
 <td class="form-title" colspan="2"><?php echo plugin_lang_get( 'manage' ), ' ', plugin_lang_get( 'repository' ) ?></td>
@@ -56,9 +56,9 @@
 </tr>
 
 <tr>
-<td width="50%"></td>
 <td width="30%"></td>
 <td width="20%"></td>
+<td width="50%"></td>
 </tr>
 
 <tr>
@@ -67,7 +67,8 @@
 <form action="<?php echo plugin_page( 'repo_delete' ) . '&id=' . $t_repo->id ?>" method="post"><input type="submit" value="<?php echo plugin_lang_get( 'delete' ), ' ', plugin_lang_get( 'repository' ) ?>"/></form>
 </td>
 <td class="right">
-<form action="<?php echo plugin_page( 'repo_import' ) . '&id=' . $t_repo->id ?>" method="post"><input type="submit" value="<?php echo plugin_lang_get( 'import_data' ) ?>"/></form>
+<form action="<?php echo plugin_page( 'repo_import_latest' ) . '&id=' . $t_repo->id ?>" method="post"><input type="submit" value="<?php echo plugin_lang_get( 'import_latest' ) ?>"/></form>
+<form action="<?php echo plugin_page( 'repo_import_full' ) . '&id=' . $t_repo->id ?>" method="post"><input type="submit" value="<?php echo plugin_lang_get( 'import_full' ) ?>"/></form>
 </td>
 </tr>