--- page.tpl.php.orig	2008-08-21 10:13:07.000000000 -0500
+++ page.tpl.php	2009-02-22 22:32:46.000000000 -0600
@@ -35,13 +35,6 @@
     <?php if ($logo) { ?>
 	  <div id="site-logo">
         <a href="<?php print $base_path ?>" title="<?php print t('Home') ?>"><img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" id="logo-image" /></a>
-		  <?php if ($site_slogan) { ?>
-		    <div class='site-slogan-logo'>
-		      <h2>
-			    <?php print $site_slogan ?>
-			  </h2>
-		    </div>
-		  <?php } ?>
 	  </div>
 	<?php } ?>
 
@@ -67,9 +60,9 @@
   </div><!-- End of header-wrapper --> 
 	
 <!-- Primary Links -->	
-	<?php if ($primary): ?>
+	<?php if ($primary_links): ?>
 	  <div id="primary-links" class="clear-block">
-        <?php print $primary ?>
+	       <?php print theme('links', $primary_links, array('class' => 'links', 'id' => 'primary-links')); ?>
 	  </div>
     <?php endif; ?>