diff --git a/old_news.php b/old_news.php
index 3bb86a7..ba07704 100644
--- a/old_news.php
+++ b/old_news.php
@@ -7,12 +7,13 @@
 <TABLE width="100%" cellSpacing="0" cellPadding="0" border="0">
 	<TR vAlign="top">
 		<TD colSpan="2"><?
-	        tableBoxHeader( 'black', tableHeadColor );
-	        tableTitle( $pageName, 1, tableHeadColor );
 			require ("lib/sql.php");
 			require ("news_funcs.php");
 			if ($month || $year) {
-				monthlyNews ($month, $year);
+		        tableBoxHeader( 'black', tableHeadColor );
+		        tableTitle( $pageName, 1, tableHeadColor );
+			 monthlyNews ($month, $year);
+			 tableBoxFooter ();
 			} else {
 				if ($string) {
 					searchNews ($string);
@@ -20,7 +21,6 @@
 					newsItem ('now', 'Web Server', "You didn't specify a search, giving up.");
 				}
 			}
-			tableBoxFooter ();
 		?></TD>
 	</TR>
 </TABLE>
diff --git a/search.php b/search.php
index 881a0eb..320ae87 100644
--- a/search.php
+++ b/search.php
@@ -4,11 +4,11 @@
 		include("old_news.php");
 	}
 	else {
-	// Preamble
-	$pageName = "Search Results";
-	$focused = "none";					// Dock icon name to gets a border
-	require("parts/preamble.php");		// Load most of document
-		echo '<P>That type of search isn\'t supported yet.  Please check back later.';
+		// Preamble
+		$pageName = "Search Results";
+		$focused = "none";					// Dock icon name to gets a border
+		require("parts/preamble.php");		// Load most of document
+			echo '<P>That type of search isn\'t supported yet.  Please check back later.';
+		require("parts/postamble.php"); 	// Finish this sucker up
 	}
-	require("parts/postamble.php"); 	// Finish this sucker up
 ?>