--- /seven/page.tpl.php	Sun Oct 17 11:01:52 2010
+++ /seven/page.tpl.php	Tue Jan 25 15:24:38 2011
@@ -27,13 +27,47 @@
 
   <div id="branding" class="clearfix">
 
-    <?php if (!empty($breadcrumb)): ?><?php print $breadcrumb; ?><?php endif; ?>
+    <div id="header">
 
-    <?php if (!empty($title)): ?>
-      <h1 class="page-title"><?php print $title; ?></h1>
-    <?php endif; ?>
+      <div id="header-left">
+        <?php if (!empty($breadcrumb)): ?><?php print $breadcrumb; ?><?php endif; ?>
 
-    <?php if (!empty($primary_local_tasks)): ?><ul class="tabs primary"><?php print $primary_local_tasks; ?></ul><?php endif; ?>
+        <?php if ($site_name || $site_slogan): ?>
+          <div id="name-and-slogan">
+            <?php if ($site_name): ?>
+              <?php if ($title): ?>
+                <div id="site-name"><strong>
+                  <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
+                </strong></div>
+              <?php else: /* Use h1 when the content title is empty */ ?>
+                <h1 id="site-name">
+                  <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
+                </h1>
+              <?php endif; ?>
+            <?php endif; ?>
+
+            <?php if ($site_slogan): ?>
+              <div id="site-slogan"><?php print $site_slogan; ?></div>
+            <?php endif; ?>
+          </div> <!-- /#name-and-slogan -->
+        <?php endif; ?>
+      </div>
+
+      <div id="header-right">
+        <?php if ($logo): ?>
+          <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home" id="logo"><img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" /></a>
+        <?php endif; ?>
+      </div>
+
+    </div>
+
+    <div id="title-tabs">
+      <?php if (!empty($title)): ?>
+        <h1 class="page-title"><?php print $title; ?></h1>
+      <?php endif; ?>
+
+      <?php if (!empty($primary_local_tasks)): ?><ul class="tabs primary"><?php print $primary_local_tasks; ?></ul><?php endif; ?>
+    </div>
 
   </div>