diff --git a/trunk/module/project/view/story.html.php b/trunk/module/project/view/story.html.php
index 85d1f78c10..109378fb53 100644
--- a/trunk/module/project/view/story.html.php
+++ b/trunk/module/project/view/story.html.php
@@ -92,7 +92,7 @@ function selectProject(projectID)
               echo $story->title;
               if($storyTasks[$story->id] > 0)
               {
-                  echo ' (' . html::a($this->createLink('story', 'tasks', "storyID=$story->id"), $storyTasks[$story->id], '', 'class=iframe') . ')';
+                  echo ' ' . html::a($this->createLink('story', 'tasks', "storyID=$story->id&projectID=$project->id"), '('. $storyTasks[$story->id] . ')', '', 'class=iframe');
               }
               else
               {
diff --git a/trunk/module/story/view/tasks.html.php b/trunk/module/story/view/tasks.html.php
index 6d615418de..08f449ea03 100644
--- a/trunk/module/story/view/tasks.html.php
+++ b/trunk/module/story/view/tasks.html.php
@@ -1,6 +1,27 @@
 <?php
+$clientTheme = $this->app->getClientTheme();
+$webRoot     = $this->app->getWebRoot();
+$jsRoot      = $webRoot . "js/";
+$themeRoot   = $webRoot . "theme/";
+?>
+<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dli'>
+<html xmlns='http://www.w3.org/1999/xhtml'>
+<head>
+  <meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
+<link rel='stylesheet' href='<?php echo $clientTheme . 'yui.css';?>' type='text/css' media='screen' />
+<link rel='stylesheet' href='<?php echo $clientTheme . 'style.css';?>' type='text/css' media='screen' />
+</head>
+<body>
+<div class="yui-d0">
+<table class='table-1'>
+<caption><?php echo $lang->story->tasks;?></caption>
+<?php
 foreach($tasks as $task)
 {
-    echo $task . "<br />";
+    echo "<tr><td>$task</td></tr>";
 }
 ?>
+</table>
+</div>
+</body>
+</html>
