diff --git a/admin/registration_list.php b/admin/registration_list.php
index 5e57a50..431ead0 100644
--- a/admin/registration_list.php
+++ b/admin/registration_list.php
@@ -69,7 +69,7 @@ if($auth_type == 'committee') {
 			'Participant Registration' => 'admin/registration.php')
 				);
 } else {
-	 send_header("Registration Management",
+	 send_header("Student/Project Management",
  		array('Fair Main' => 'fair_main.php') );
 }
 
diff --git a/fair_main.php b/fair_main.php
index 3ade37a..0cffb11 100644
--- a/fair_main.php
+++ b/fair_main.php
@@ -41,52 +41,27 @@
   */
  send_header("Science Fair Main", array());
 
- function tempstatus()
- {
-	 return 'complete';
- }
-
  //only display the named greeting if we have their name
  echo i18n("Hello <b>%1</b>",array($_SESSION['name']));
  echo "<br />";
  echo "<br />";
 
- echo i18n("Please use the checklist below to complete your data. Click on an item in the table to edit that information.  When you have entered all information, the <b>Status</b> field will change to <b>Complete</b>");
- echo "<br />";
- echo "<br />";
 
- user_page_summary_begin();
- user_page_summary_item("Fair Information and Statistics", 
- 		"fair_stats.php", "tempstatus", array($u));
- user_page_summary_item("Award Winner Entry", 
- 		"", "tempstatus", array($u));
- $overallstatus = user_page_summary_end(true);
-
- /* Update fair_status */
- fair_status_update($u);
-
- echo "<br />";
- echo "<br />";
-
- /*
- if($overallstatus!='complete')
- {
-	echo error(i18n("You will not be marked as an active fair until your \"Overall Status\" is \"Complete\""));
- }
- else
- {
-	echo happy(i18n("Thank you for completing the fair registration process.  We look forward to seeing you at the fair"));
- }
-  */
- echo "<br />";
- echo i18n('Other Options and Things To Do').':<br />';
- echo '<ul>';
- echo '<li><a href="user_password.php">'.i18n('Change Password').'</a> - '.i18n('Change your password').'</li>';
- echo '<li><a href="user_activate.php">'.i18n('Activate/Deactivate Roles').'</a> - '.
-		i18n('Activate/Deactiate/Remove/Delete roles or your entire account').
-		'</li>';
- echo '<li>'.i18n('To logout, use the [Logout] link in the upper-right of the page').'</li>';
- echo '</ul>';
+ echo "<table class=\"adminconfigtable\">";
+ echo " <tr>";
+ echo "  <td><a href=\"fair_stats.php\">".theme_icon("fair_stats")."<br />".i18n("Fair Information and Statistics")."</a></td>";
+ echo "  <td><a href=\"admin/registration_list.php\">".theme_icon("participant_registration")."<br />".i18n("Student/Project Management")."</a></td>";
+ echo "  <td><a href=\"admin/winners.php\">".theme_icon("enter_winning_projects")."<br />".i18n("Enter Winning Projects")."</a></td>";
+ echo " </tr>\n";
+ echo "</table>\n";
+ echo "<hr/>";
+ echo "<table class=\"adminconfigtable\">";
+ echo " <tr>\n";
+ echo "  <td><a href=\"user_personal.php\">".theme_icon("edit_profile")."<br />".i18n("Edit My Profile")."</a></td>";
+ echo "  <td><a href=\"user_password.php\">".theme_icon("change_password")."<br />".i18n("Change My Password")."</a></td>";
+ echo "  <td><a href=\"user_activate.php\">".theme_icon("manage_roles")."<br />".i18n("Manage My Roles")."</a></td>";
+ echo " </tr>\n";
+ echo "</table>\n";
 
  send_footer();
 ?>