diff --git a/template.php b/template.php
index ef2fa43..6d7f7db 100644
--- a/template.php
+++ b/template.php
@@ -150,8 +150,13 @@ function tao_preprocess_node(&$vars) {
 
   $vars['attributes_array']['id'] = "node-{$vars['node']->nid}";
 
-  $vars['title_attributes_array']['class'][] = 'node-title';
-  $vars['title_attributes_array']['class'][] = 'clearfix';
+  if ($vars['page']) {
+    unset($vars['title']);
+  }
+  else {
+    $vars['title_attributes_array']['class'][] = 'node-title';
+    $vars['title_attributes_array']['class'][] = 'clearfix';
+  }
 
   $vars['content_attributes_array']['class'][] = 'node-content';
   $vars['content_attributes_array']['class'][] = 'clearfix';
@@ -167,10 +172,12 @@ function tao_preprocess_node(&$vars) {
     unset($vars['content']['comments']);
   }
 
-  $vars['submitted'] = t('Submitted by !username on !datetime', array(
-    '!username' => $vars['name'],
-    '!datetime' => $vars['date'],
-  ));
+  if ($vars['display_submitted']) {
+    $vars['submitted'] = t('Submitted by !username on !datetime', array(
+      '!username' => $vars['name'],
+      '!datetime' => $vars['date'],
+    ));
+  }
 }
 
 /**