=== modified file 'node.tpl.php'
--- node.tpl.php	2009-10-26 21:30:49 +0000
+++ node.tpl.php	2009-10-25 01:03:06 +0000
@@ -52,16 +52,22 @@
 
   <?php print $picture ?>
 
-  <?php if (!$page): ?>
+  <?php if (!$page && $title): ?>
   <h2><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
   <?php endif; ?>
 
+  <?php if ($submitted): ?>
   <div class="submitted"><?php print $submitted ?></div>
-
-  
+  <?php endif; ?>
 
   <?php print $content ?>
+  
+  <?php if ($terms): ?>
   <div class="taxonomy"><?php print $terms ?></div>
+  <?php endif; ?>
+  
+  <?php if ($links): ?>
   <div class="node-links"><?php print $links; ?></div>
+  <?php endif; ?>
 
 </div>
\ No newline at end of file