diff --git a/module/story/control.php b/module/story/control.php
index 8ec0a17e9f..df435e0c3d 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -132,7 +132,7 @@ class story extends control
             }
         }
 
-        $this->view->header->title    = $product->name . $this->lang->colon . $this->lang->story->create;
+        $this->view->title            = $product->name . $this->lang->colon . $this->lang->story->create;
         $this->view->position[]       = html::a($this->createLink('product', 'browse', "product=$productID"), $product->name);
         $this->view->position[]       = $this->lang->story->create;
         $this->view->products         = $products;
@@ -196,7 +196,7 @@ class story extends control
         $plans = $this->loadModel('productplan')->getPairs($productID, 'unexpired');
         $plans['same'] = $this->lang->story->same;
 
-        $this->view->header->title    = $product->name . $this->lang->colon . $this->lang->story->create;
+        $this->view->title            = $product->name . $this->lang->colon . $this->lang->story->create;
         $this->view->position[]       = html::a($this->createLink('product', 'browse', "product=$productID"), $product->name);
         $this->view->position[]       = $this->lang->story->create;
         $this->view->products         = $products;
@@ -269,10 +269,10 @@ class story extends control
         $this->commonAction($storyID);
   
         /* Assign. */
-        $this->view->header->title = $this->view->product->name . $this->lang->colon . $this->lang->story->edit . $this->lang->colon . $this->view->story->title;
-        $this->view->position[]    = $this->lang->story->edit;
-        $this->view->users         = $this->user->appendDeleted($this->user->getPairs('nodeleted|pofirst'), $this->view->story->assignedTo);
-        $this->view->story         = $this->story->getById($storyID, 0, true);
+        $this->view->title      = $this->view->product->name . $this->lang->colon . $this->lang->story->edit . $this->lang->colon . $this->view->story->title;
+        $this->view->position[] = $this->lang->story->edit;
+        $this->view->users      = $this->user->appendDeleted($this->user->getPairs('nodeleted|pofirst'), $this->view->story->assignedTo);
+        $this->view->story      = $this->story->getById($storyID, 0, true);
         $this->display();
     }
 
@@ -340,12 +340,12 @@ class story extends control
             if(!$projectID)
             {
                 $product = $this->product->getByID($productID);
-                $this->view->header->title = $product->name . $this->lang->colon . $this->lang->story->batchEdit;
+                $this->view->title = $product->name . $this->lang->colon . $this->lang->story->batchEdit;
             }
             else
             {
                 $project = $this->project->getByID($projectID);
-                $this->view->header->title = $project->name . $this->lang->colon . $this->lang->story->batchEdit;
+                $this->view->title = $project->name . $this->lang->colon . $this->lang->story->batchEdit;
             }
             if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo;
             $this->view->position[]        = $this->lang->story->common;
@@ -415,8 +415,8 @@ class story extends control
         $this->app->loadLang('project');
 
         /* Assign. */
-        $this->view->header->title = $this->view->product->name . $this->lang->colon . $this->lang->story->change . $this->lang->colon . $this->view->story->title;
-        $this->view->position[]    = $this->lang->story->change;
+        $this->view->title      = $this->view->product->name . $this->lang->colon . $this->lang->story->change . $this->lang->colon . $this->view->story->title;
+        $this->view->position[] = $this->lang->story->change;
         $this->display();
     }
 
@@ -442,8 +442,8 @@ class story extends control
         $this->commonAction($storyID);
 
         /* Assign. */
-        $this->view->header->title = $this->view->product->name . $this->lang->colon . $this->lang->story->activate . $this->lang->colon . $this->view->story->title;
-        $this->view->position[]    = $this->lang->story->activate;
+        $this->view->title      = $this->view->product->name . $this->lang->colon . $this->lang->story->activate . $this->lang->colon . $this->view->story->title;
+        $this->view->position[] = $this->lang->story->activate;
         $this->display();
     }
 
@@ -473,11 +473,11 @@ class story extends control
         /* Set the menu. */
         $this->product->setMenu($this->product->getPairs(), $product->id);
 
-        $header['title'] = "STORY #$story->id $story->title - $product->name";
-        $position[]      = html::a($this->createLink('product', 'browse', "product=$product->id"), $product->name);
-        $position[]      = $this->lang->story->view;
+        $title      = "STORY #$story->id $story->title - $product->name";
+        $position[] = html::a($this->createLink('product', 'browse', "product=$product->id"), $product->name);
+        $position[] = $this->lang->story->view;
 
-        $this->view->header     = $header;
+        $this->view->title      = $title;
         $this->view->position   = $position;
         $this->view->product    = $product;
         $this->view->plan       = $plan;
@@ -551,9 +551,9 @@ class story extends control
         if($story->status == 'draft' and $story->version == 1) unset($this->lang->story->reviewResultList['revert']);
         if($story->status == 'changed') unset($this->lang->story->reviewResultList['reject']);
 
-        $this->view->header->title = $product->name . $this->lang->colon . $this->lang->story->view . $this->lang->colon . $story->title;
-        $this->view->position[]    = html::a($this->createLink('product', 'browse', "product=$product->id"), $product->name);
-        $this->view->position[]    = $this->lang->story->view;
+        $this->view->title      = $product->name . $this->lang->colon . $this->lang->story->view . $this->lang->colon . $story->title;
+        $this->view->position[] = html::a($this->createLink('product', 'browse', "product=$product->id"), $product->name);
+        $this->view->position[] = $this->lang->story->view;
 
         $this->view->product = $product;
         $this->view->story   = $story;
@@ -599,9 +599,9 @@ class story extends control
         /* Set the closed reason options. */
         if($story->status == 'draft') unset($this->lang->story->reasonList['cancel']);
 
-        $this->view->header->title = $product->name . $this->lang->colon . $this->lang->close . $this->lang->colon . $story->title;
-        $this->view->position[]    = html::a($this->createLink('product', 'browse', "product=$product->id"), $product->name);
-        $this->view->position[]    = $this->lang->close;
+        $this->view->title      = $product->name . $this->lang->colon . $this->lang->close . $this->lang->colon . $story->title;
+        $this->view->position[] = html::a($this->createLink('product', 'browse', "product=$product->id"), $product->name);
+        $this->view->position[] = $this->lang->close;
 
         $this->view->product = $product;
         $this->view->story   = $story;
@@ -661,12 +661,12 @@ class story extends control
             if(!$projectID)
             {
                 $product = $this->product->getByID($productID);
-                $this->view->header->title = $product->name . $this->lang->colon . $this->lang->story->batchClose;
+                $this->view->title = $product->name . $this->lang->colon . $this->lang->story->batchClose;
             }
             else
             {
                 $project = $this->project->getByID($projectID);
-                $this->view->header->title = $project->name . $this->lang->colon . $this->lang->story->batchClose;
+                $this->view->title = $project->name . $this->lang->colon . $this->lang->story->batchClose;
             }
             if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo;
             $this->view->position[]       = $this->lang->story->common;
@@ -844,7 +844,8 @@ class story extends control
         }
         $this->products = $this->product->getPairs();
         $this->product->setMenu($this->products, $productID);
-        $this->view->header->title = $this->products[$productID] . $this->lang->colon . $this->lang->story->common;
+
+        $this->view->title         = $this->products[$productID] . $this->lang->colon . $this->lang->story->common;
         $this->view->productID     = $productID;
         $this->view->browseType    = $browseType;
         $this->view->moduleID      = $moduleID;