diff --git a/tasklist/src/plugin-resources/templates/tasklist.vm b/tasklist/src/plugin-resources/templates/tasklist.vm
index c858bae7..49738f3f 100644
--- a/tasklist/src/plugin-resources/templates/tasklist.vm
+++ b/tasklist/src/plugin-resources/templates/tasklist.vm
@@ -8,6 +8,45 @@
   
   <body>
     <section name="Todos">
+	  <p>
+	  </p>
+	  <table>
+		<th>Class</th>
+		<th>Class Todos Count</th>
+		<th>Method with Todos</th>
+	    #foreach ($class in $docInfo.classes)
+		  #set ($classTodosCount = $class.getTags($jellyContext.taskTag).size() )
+          #set ($methodTodosCount = 0)
+	      #foreach ($m in $class.methods)
+	        #set ($methodTodoTags = $m.getTags($jellyContext.taskTag))
+            #if ($methodTodoTags.size() > 0)
+	          #set ($methodTodosCount = $methodTodosCount + 1 )
+		    #end
+	      #end
+		  #if ($classTodosCount > 0 || $methodTodosCount > 0)
+		    <tr>
+		      <td>
+			    <a href="#$class.name">$class.name</a>
+		      </td>
+	          <td>
+			    #if ($classTodosCount > 0)
+			      <a href="#$class.name">$classTodosCount</a>
+			    #else
+			      0
+			    #end
+		      </td>
+		      <td>
+			    #if ($methodTodosCount > 0)
+			      <a href="#${class.name}.methods">$methodTodosCount</a>
+			    #else
+			      0
+			    #end
+		      </td>
+		    </tr>
+		  #end
+	  #end
+	  </table>
+	  <hr/>
       <p>
           #foreach ($class in $docInfo.classes)
             #set ($todoTags = $class.getTags($jellyContext.taskTag))
@@ -20,6 +59,7 @@
             #end
             #if ($todoTags.size() > 0 || $hasToDoMethod)
               <subsection name="$class.name">
+		        <a name="$class.name"></a>
                 #if ($todoTags.size() > 0)
                   <table>
                     <th>Class Todos</th>
@@ -37,7 +77,7 @@
                   #set ($methodTodoTags = $m.getTags($jellyContext.taskTag))
                   #if ($methodTodoTags.size() > 0)
                     <table>
-                    <th>Method Todos</th>
+                    <th><a name="${class.name}.methods">Method Todos</a></th>
                     #foreach ($tag in $methodTodoTags)
                       <tr>
                         <td>