diff --git a/ingo/templates/basic/script/_script.html.php b/ingo/templates/basic/script/_script.html.php
index a7285d19bff..41e9ca9dec6 100644
--- a/ingo/templates/basic/script/_script.html.php
+++ b/ingo/templates/basic/script/_script.html.php
@@ -1,6 +1,5 @@
-<h2 class="smallheader"><?php echo _("Script name:") . ' ' . $this->h($script['name']) ?></h2>
 <pre>
 <?php foreach ($script['lines'] as $i => $line): ?>
-    <?php printf('%' . $script['width'] . "d: %s\n", $i + 1, $this->h($line)) ?>
+<?php printf('%' . $script['width'] . "d: %s\n", $i + 1, $this->h($line)) ?>
 <?php endforeach; ?>
 </pre>
diff --git a/ingo/templates/basic/script/script.html.php b/ingo/templates/basic/script/script.html.php
index 625062a1a8b..30f5bef1a49 100644
--- a/ingo/templates/basic/script/script.html.php
+++ b/ingo/templates/basic/script/script.html.php
@@ -1,32 +1,28 @@
 <h1 class="header"><?php echo _("Script") ?></h1>
 <?php if ($this->scriptexists): ?>
-<table class="scriptHeader">
- <tr>
-  <td align="center">
+<div class="horde-form-buttons scriptHeader">
 <?php if ($this->showactivate): ?>
-   <form method="post" name="activate_script" action="<?php echo $this->scripturl ?>">
-    <input type="hidden" name="actionID" value="action_activate" />
-    <input class="horde-default" type="submit" name="submit" value="<?php echo _("Activate Script") ?>" />
-   </form>
-   <form method="post" name="deactivate_script" action="<?php echo $this->scripturl ?>">
-    <input type="hidden" name="actionID" value="action_deactivate" />
-    <input type="submit" name="submit" value="<?php echo _("Deactivate Script") ?>" />
-   </form>
-   <form method="post" name="show_active_script" action="<?php echo $this->scripturl ?>">
-    <input type="hidden" name="actionID" value="show_active" />
-    <input type="submit" name="submit" value="<?php echo _("Show Active Script") ?>" />
-   </form>
+ <form method="post" name="activate_script" action="<?php echo $this->scripturl ?>">
+  <input type="hidden" name="actionID" value="action_activate" />
+  <input class="horde-default" type="submit" name="submit" value="<?php echo _("Activate Script") ?>" />
+ </form>
+ <form method="post" name="deactivate_script" action="<?php echo $this->scripturl ?>">
+  <input type="hidden" name="actionID" value="action_deactivate" />
+  <input type="submit" name="submit" value="<?php echo _("Deactivate Script") ?>" />
+ </form>
+ <form method="post" name="show_active_script" action="<?php echo $this->scripturl ?>">
+  <input type="hidden" name="actionID" value="show_active" />
+  <input type="submit" name="submit" value="<?php echo _("Show Active Script") ?>" />
+ </form>
 <?php else: ?>
-   <form method="post" name="show_current_script" action="<?php echo $this->scripturl ?>">
-    <input type="submit" name="submit" value="<?php echo _("Show Current Script") ?>" />
-   </form>
+ <form method="post" name="show_current_script" action="<?php echo $this->scripturl ?>">
+  <input type="submit" name="submit" value="<?php echo _("Show Current Script") ?>" />
+ </form>
 <?php endif; ?>
-  </td>
- </tr>
-</table>
+</div>
 
 <?php echo $this->renderPartial('script', array('collection' => $this->scripts)) ?>
 
 <?php else: ?>
-<div>[<?php echo _("No script generated.") ?>]</div>
+<div class="scriptHeader">[<?php echo _("No script generated.") ?>]</div>
 <?php endif; ?>
diff --git a/ingo/themes/default/screen.css b/ingo/themes/default/screen.css
index b0fe457fcde..29d36e04fe7 100644
--- a/ingo/themes/default/screen.css
+++ b/ingo/themes/default/screen.css
@@ -5,6 +5,8 @@ table {
 
 /* Scripts page. */
 .scriptHeader {
+    margin: 0;
+    text-align: center;
     width: 100%;
 }
 .scriptHeader form {