diff --git a/templates/node--nm_announcement--teaser.tpl.php b/templates/node--nm_announcement--teaser.tpl.php
index 11e24af92566bbe103844176bd87257f408567be..6576ed649e1a8de2c939263f4e25852b8dc9a4b4 100644
--- a/templates/node--nm_announcement--teaser.tpl.php
+++ b/templates/node--nm_announcement--teaser.tpl.php
@@ -2,7 +2,7 @@
   //krumo($content);
 ?>
 <article<?php print $attributes; ?>>
-  
+  <div class="node-content clearfix">
   <?php print render($title_prefix); ?>
   <?php if (!$page && $title): ?>
   <header>
@@ -10,8 +10,11 @@
     <h2<?php print $title_attributes; ?>><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
   </header>
   <?php endif; ?>
-  <?php print render($title_suffix); ?>
   
+  <?php print render($title_suffix); ?>
+  <?php if ($display_submitted): ?>
+    <footer class="submitted"><?php print $submission_info; ?></footer>
+  <?php endif; ?>
 
   <div<?php print $content_attributes; ?>>
     <?php
@@ -25,8 +28,6 @@
       <nav class="links node-links clearfix"><?php print render($content['links']); ?></nav>
     <?php endif; ?>
     
-    <?php if ($display_submitted): ?>
-      <footer class="submitted"><?php print $user_picture; ?><?php print $submission_info; ?></footer>
-    <?php endif; ?>
+  </div>
   </div>
 </article>
diff --git a/templates/node--nm_blog--teaser.tpl.php b/templates/node--nm_blog--teaser.tpl.php
index 2fe709b7c8a29cd7d1e3c2e2bdd264110f9d9218..d493bedc2c1c33b6c519e836c5c7a2f5d47d20f6 100644
--- a/templates/node--nm_blog--teaser.tpl.php
+++ b/templates/node--nm_blog--teaser.tpl.php
@@ -2,7 +2,7 @@
   //krumo($content);
 ?>
 <article<?php print $attributes; ?>>
-  
+  <div class="node-content clearfix">
   <?php print render($title_prefix); ?>
   <?php if (!$page && $title): ?>
   <header>
@@ -11,7 +11,9 @@
   </header>
   <?php endif; ?>
   <?php print render($title_suffix); ?>
-  
+  <?php if ($display_submitted): ?>
+    <footer class="submitted"><?php print $submission_info; ?></footer>
+  <?php endif; ?>
 
   <div<?php print $content_attributes; ?>>
     <?php
@@ -20,16 +22,13 @@
       hide($content['links']);
       print render($content);
     ?>
-    <?php if ($display_submitted): ?>
-      <footer class="submitted"><?php print $user_picture; ?><?php print $submission_info; ?></footer>
-    <?php endif; ?>
+    
   </div>
 
   <div class="clearfix">
     <?php if (!empty($content['links'])): ?>
       <nav class="links node-links clearfix"><?php print render($content['links']); ?></nav>
     <?php endif; ?>
-
-    <?php print render($content['comments']); ?>
+  </div>
   </div>
 </article>
diff --git a/templates/node--nm_blog.tpl.php b/templates/node--nm_blog.tpl.php
index c37062f4f731b6bfa9898de42ffceabd2c66ccc7..adb3fb5cda446e22838cc2c96b52a65581f86d64 100644
--- a/templates/node--nm_blog.tpl.php
+++ b/templates/node--nm_blog.tpl.php
@@ -12,6 +12,10 @@
         <?php print render($content['field_nm_headline_image']); ?>
       <?php endif; ?>
             
+      <?php if ($display_submitted): ?>
+        <div class="submitted"><?php print $submission_info; ?></div>
+      <?php endif; ?>
+      
       <div class="node-category node-terms share clearfix">
         <?php if (isset($content['field_nm_blog_category'])): ?>
           <div class="category-term"><?php print render($content['field_nm_blog_category']); ?></div>
@@ -30,23 +34,20 @@
         hide($content['field_nm_tags']);
         print render($content);
       ?>
-      <?php if (!empty($content['links'])): ?>
-        <nav class="links node-links clearfix"><?php print render($content['links']); ?></nav>
-      <?php endif; ?>
-      
-      <div class="node-category node-terms share clearfix">
-        <?php if (isset($content['field_nm_tags'])): ?>
-          <div class="category-term tags"><?php print render($content['field_nm_tags']); ?></div>
-        <?php endif; ?>
-        <?php if (isset($content['sharethis'])): ?>
-          <div class="share-wrapper"><?php print render($content['sharethis']); ?></div>
-        <?php endif; ?>
-      </div>
       
       <footer> 
-        <?php if ($display_submitted): ?>
-          <span class="submitted"><?php print $submission_info; ?></span>
+        <?php if (!empty($content['links'])): ?>
+          <nav class="links node-links clearfix"><?php print render($content['links']); ?></nav>
         <?php endif; ?>
+        
+        <div class="node-category node-terms share clearfix">
+          <?php if (isset($content['field_nm_tags'])): ?>
+            <div class="category-term tags"><?php print render($content['field_nm_tags']); ?></div>
+          <?php endif; ?>
+          <?php if (isset($content['sharethis'])): ?>
+            <div class="share-wrapper"><?php print render($content['sharethis']); ?></div>
+          <?php endif; ?>
+        </div>
       </footer>
       
     </div>
diff --git a/templates/node--nm_event--nm_event_listing.tpl.php b/templates/node--nm_event--nm_event_listing.tpl.php
index 356a9e4223ea99eaf4d2d0e1c7c528ed15966075..cff227020f03c1395cda6ef4a9b81c24a1324aea 100644
--- a/templates/node--nm_event--nm_event_listing.tpl.php
+++ b/templates/node--nm_event--nm_event_listing.tpl.php
@@ -2,33 +2,14 @@
   //krumo($content);
 ?>
 <article<?php print $attributes; ?>>
-  
-  <div class="calendar-icon">
-    <div class="month"><?php print($calendar['start_month']); ?></div>
-    <div class="day"><?php print($calendar['start_day']); ?></div>
-  </div>
-  
-  <?php print render($title_prefix); ?>
-  <?php if ($title): ?>
-  <header>
+  <div class="event-summary clearfix">
+    <div class="calendar-icon">
+      <div class="month"><?php print($calendar['start_month']); ?></div>
+      <div class="day"><?php print($calendar['start_day']); ?></div>
+    </div>
+    
     <h2<?php print $title_attributes; ?>><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
-  </header>
-  <?php endif; ?>
-  <?php print render($title_suffix); ?>
-
-  <div<?php print $content_attributes; ?>>
-    <?php
-      // We hide the comments and links now so that we can render them later.
-      hide($content['comments']);
-      hide($content['links']);
-      hide($content['sharethis']);
-      print render($content);
-    ?>
-  </div>
-
-  <div class="clearfix">
-    <?php if (!empty($content['links'])): ?>
-      <nav class="links node-links clearfix"><?php print render($content['links']); ?></nav>
-    <?php endif; ?>
-  </div>
+    
+    <?php print render($content['field_nm_date']); ?>
+    </div>
 </article>
diff --git a/templates/node--nm_event--teaser.tpl.php b/templates/node--nm_event--teaser.tpl.php
index 9b18f001359e876128abf90bfd979a011a12cb32..e738024b343321b87f4fe5b65f037adb52f5fb53 100644
--- a/templates/node--nm_event--teaser.tpl.php
+++ b/templates/node--nm_event--teaser.tpl.php
@@ -3,19 +3,25 @@
 ?>
 <article<?php print $attributes; ?>>
   
-  <div class="calendar-icon">
-    <div class="month"><?php print($calendar['start_month']); ?></div>
-    <div class="day"><?php print($calendar['start_day']); ?></div>
-  </div>
+  <div class="node-content clearfix">
   
   <?php print render($title_prefix); ?>
-  <?php if ($title): ?>
   <header>
+    <div class="event-summary clearfix">
+    <div class="calendar-icon">
+      <div class="month"><?php print($calendar['start_month']); ?></div>
+      <div class="day"><?php print($calendar['start_day']); ?></div>
+    </div>
+    
     <h2<?php print $title_attributes; ?>><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
+    
+    <?php print render($content['field_nm_date']); ?>
+    </div>
   </header>
-  <?php endif; ?>
   <?php print render($title_suffix); ?>
-
+  
+  <?php print render($content['field_nm_headline_image']); ?>
+  
   <div<?php print $content_attributes; ?>>
     <?php
       // We hide the comments and links now so that we can render them later.
@@ -33,4 +39,6 @@
 
     <?php print render($content['comments']); ?>
   </div>
+  
+  </div>
 </article>
diff --git a/templates/node--nm_event.tpl.php b/templates/node--nm_event.tpl.php
index 60964133b425452fe83722816f0852c942afef31..8ebdb3053982a58f986302a0eeb6b86c2518dd97 100644
--- a/templates/node--nm_event.tpl.php
+++ b/templates/node--nm_event.tpl.php
@@ -11,6 +11,10 @@
         <?php print render($content['field_nm_headline_image']); ?>
       <?php endif; ?>
       
+      <?php if ($display_submitted): ?>
+        <div class="submitted"><?php print $submission_info; ?></div>
+      <?php endif; ?>
+      
       <div class="event-date clearfix">
         <?php if ($event_dates['start']): ?>
         <div class="event-start">
@@ -68,25 +72,20 @@
           </div>
         </div>
       </div>
-      
-      <div class="node-category node-terms share clearfix">
-        <?php if (isset($content['field_nm_tags'])): ?>
-          <div class="category-term tags"><?php print render($content['field_nm_tags']); ?></div>
-        <?php endif; ?>
-        <?php if (isset($content['sharethis'])): ?>
-          <div class="share-wrapper"><?php print render($content['sharethis']); ?></div>
-        <?php endif; ?>
-      </div> 
-      
-      <?php if (!empty($content['links'])): ?>
-        <nav class="links node-links clearfix"><?php print render($content['links']); ?></nav>
-      <?php endif; ?>
-      
+            
       <footer>
-       
-      <?php if ($display_submitted): ?>
-        <span class="submitted"><?php print $submission_info; ?></span>
-      <?php endif; ?>
+        <div class="node-category node-terms share clearfix">
+          <?php if (isset($content['field_nm_tags'])): ?>
+            <div class="category-term tags"><?php print render($content['field_nm_tags']); ?></div>
+          <?php endif; ?>
+          <?php if (isset($content['sharethis'])): ?>
+            <div class="share-wrapper"><?php print render($content['sharethis']); ?></div>
+          <?php endif; ?>
+        </div> 
+        
+        <?php if (!empty($content['links'])): ?>
+          <nav class="links node-links clearfix"><?php print render($content['links']); ?></nav>
+        <?php endif; ?>
       </footer>
       
     </div>
diff --git a/templates/node--nm_gallery--teaser.tpl.php b/templates/node--nm_gallery--teaser.tpl.php
index eeb10300ee15800f51cc0294d18a059c75691680..af2da809a25bb74d9d724d971aff34dc0bff931e 100644
--- a/templates/node--nm_gallery--teaser.tpl.php
+++ b/templates/node--nm_gallery--teaser.tpl.php
@@ -2,26 +2,27 @@
   //krumo($content);
 ?>
 <article<?php print $attributes; ?>>
-  
-  <?php print render($title_prefix); ?>
-  <?php if (!$page && $title): ?>
-  <header>
-    <?php print render($content['field_nm_headline_image']); ?>
-    <h2<?php print $title_attributes; ?>><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
-  </header>
-  <?php endif; ?>
-  <?php print render($title_suffix); ?>
-  
-  <div<?php print $content_attributes; ?>>
-    <?php
-      // We hide the comments and links now so that we can render them later.
-      hide($content['comments']);
-      hide($content['links']);
-      hide($content['sharethis']);
-      print render($content);
-    ?>
-    <div class="photo-count">
-      <?php print $photo_count; ?>
+  <div class="node-content clearfix">
+    <?php print render($title_prefix); ?>
+    <?php if (!$page && $title): ?>
+    <header>
+      <?php print render($content['field_nm_headline_image']); ?>
+      <h2<?php print $title_attributes; ?>><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
+    </header>
+    <?php endif; ?>
+    <?php print render($title_suffix); ?>
+    
+    <div<?php print $content_attributes; ?>>
+      <?php
+        // We hide the comments and links now so that we can render them later.
+        hide($content['comments']);
+        hide($content['links']);
+        hide($content['sharethis']);
+        print render($content);
+      ?>
+      <div class="photo-count">
+        <?php print $photo_count; ?>
+      </div>
     </div>
   </div>
 </article>
diff --git a/templates/node.tpl.php b/templates/node.tpl.php
index 9dd295ad4ce3aac69b25d8744be7691352c6e0e4..0223025310f831101c65f3a2aabc28f34f0974ca 100644
--- a/templates/node.tpl.php
+++ b/templates/node.tpl.php
@@ -20,11 +20,22 @@
         <?php print render($content['field_nm_headline_image']); ?>
       <?php endif; ?>
       
+      <?php if (!$page && $title): ?>
+        <h2<?php print $title_attributes; ?>><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
+      <?php endif; ?>
+      
+      <?php if ($display_submitted): ?>
+        <div class="submitted"><?php print $submission_info; ?></div>
+      <?php endif; ?>
+      
       <div class="node-category node-terms share clearfix">
+        <?php if (isset($content['taxonomy_forums'])): ?>
+          <div class="category-term"><?php print render($content['taxonomy_forums']); ?></div>
+        <?php endif; ?>
         <?php if (isset($content['sharethis'])): ?>
           <div class="share-wrapper"><?php print render($content['sharethis']); ?></div>
         <?php endif; ?>
-      </div> 
+      </div>
     </header>
     
     <?php print render($title_suffix); ?>
@@ -35,6 +46,7 @@
         hide($content['comments']);
         hide($content['links']);
         hide($content['field_nm_tags']);
+        hide($content['taxonomy_forums']);
         hide($content['sharethis']);
         print render($content);
       ?>
@@ -52,9 +64,7 @@
       </div> 
       
       <footer>
-      <?php if ($display_submitted): ?>
-        <span class="submitted"><?php print $submission_info; ?></span>
-      <?php endif; ?>
+      
       </footer>
       
     </div>