diff --git a/template.php b/template.php
index d6543e6..2c9b838 100644
--- a/template.php
+++ b/template.php
@@ -48,7 +48,7 @@ function tweme_theme($existing, $type, $theme, $path) {
         'messages' => NULL,
         'help' => array(),
         'tabs' => array(),
-        'actions' => array(),
+        'action_links' => array(),
       ),
     ),
     'copyright' => array(
diff --git a/templates/page.tpl.php b/templates/page.tpl.php
index 8c24134..bc42494 100644
--- a/templates/page.tpl.php
+++ b/templates/page.tpl.php
@@ -55,6 +55,9 @@
       <?php endif ?>
       <!-- Content -->
       <section id="content" class="span<?php print $content_cols ?>">
+      <?php if ($action_links) : ?>
+        <ul class="action-links"><?php print render($action_links) ?></ul>
+      <?php endif ?>
         <?php print render($page['content']) ?>
       </section>
       <?php if ($has_sidebar_second): ?>
diff --git a/templates/preface.tpl.php b/templates/preface.tpl.php
index c439213..d3c58a9 100644
--- a/templates/preface.tpl.php
+++ b/templates/preface.tpl.php
@@ -13,6 +13,3 @@ if ($title) {
 }
 print render($help);
 print render($tabs);
-if ($actions) {
-  print '<ul class="action-links">' . render($actions) . '</ul>';
-}