diff --git a/css/style.css b/css/style.css
index 6d1e67b..464fca3 100644
--- a/css/style.css
+++ b/css/style.css
@@ -192,7 +192,7 @@ input[type=submit]:hover {
 .r4,
 .md-image,
 .md-content,
-#content-header h1,
+#content-header #title-tabs,
 #content-area,
 .fullnode,
 .comment-wrapper,
@@ -235,7 +235,7 @@ ul.pager {
 
 /* CONTENT
 -----------------------------------*/
-#content-header h1,
+#content-header #title-tabs,
 .fullnode,
 .comment-wrapper,
 #content-area {
@@ -244,14 +244,13 @@ ul.pager {
 	color: #fff;
 }
 
-#content-header {
-	position: relative
+#content-header div.tabs {
+	float: right;
 }
 
-#content-header .tabs {
-	position: absolute;
-	top: 5px;
-	right: 3px
+#content-header div.tabs ul.tabs {
+  clear: right;
+	float: right;
 }
 
 .tabs ul.primary {
@@ -267,8 +266,9 @@ ul.pager {
 }
 
 #content-header h1 {
-	margin: 0;
+	margin: 0 1em 0 0;
 	color: #fff;
+  float: left;
 }
 
 #content-area,
diff --git a/js/md_minimal.js b/js/md_minimal.js
index 9b876a9..c2dfcae 100644
--- a/js/md_minimal.js
+++ b/js/md_minimal.js
@@ -1,13 +1,8 @@
 jQuery(function() {
-	var $totalw = 50;
 	var $totalcmw = 50;
-	jQuery('#content-header a').each(function(){
-		$totalw += jQuery(this).outerWidth();
-	});
 	jQuery('#comments div.links:first a').each(function(){
 		$totalcmw += jQuery(this).outerWidth();
 	});
-	jQuery('#content-header div.tabs').width($totalw);
 	jQuery('#comments div.links').width($totalcmw);
 	
 	jQuery('.node-teaser').hover(
diff --git a/templates/page.tpl.php b/templates/page.tpl.php
index ea9ff33..77ee9bf 100644
--- a/templates/page.tpl.php
+++ b/templates/page.tpl.php
@@ -25,24 +25,30 @@
 
   <div id="main" class="clearfix">
     <div id="content">
-			<?php if ($breadcrumb || $title|| $messages || $tabs || $action_links): ?>
+			<?php if ($breadcrumb || $title || $messages || $tabs || $action_links): ?>
         <div id="content-header">
 
           <?php if ($page['highlight']): ?>
             <div id="highlight"><?php print render($page['highlight']) ?></div>
           <?php endif; ?>
 
-          <?php if ($title): ?>
-            <h1 class="title"><?php print $title; ?></h1>
+          <?php if ($title || $tabs): ?>
+            <div id="title-tabs" class="clearfix">
+
+              <?php if ($title): ?>
+                <h1 class="title"><?php print $title; ?></h1>
+              <?php endif; ?>
+
+              <?php if ($tabs): ?>
+                <div class="tabs"><?php print render($tabs); ?></div>
+              <?php endif; ?>
+
+            </div>
           <?php endif; ?>
 
           <?php print $messages; ?>
           <?php print render($page['help']); ?>
 
-          <?php if ($tabs): ?>
-            <div class="tabs"><?php print render($tabs); ?></div>
-          <?php endif; ?>
-
           <?php if ($action_links): ?>
             <ul class="action-links"><?php print render($action_links); ?></ul>
           <?php endif; ?>
@@ -65,4 +71,4 @@
     </div> <!-- /footer -->
   <?php endif; ?>
 
-</div> <!-- /page -->
\ No newline at end of file
+</div> <!-- /page -->