diff --git a/applications/admin/views/default/edit.html b/applications/admin/views/default/edit.html
index 4e8d0427..31f7a040 100644
--- a/applications/admin/views/default/edit.html
+++ b/applications/admin/views/default/edit.html
@@ -251,6 +251,10 @@ $(document).on('click', 'a.font_button', function (e) {
 </div>
 
 <script>
+    $(document).on('click', '#window_todo li a', function (e) {
+        $(this).find('i').toggleClass('icon-chevron-right');
+        $(this).find('i').toggleClass('icon-chevron-down');
+    });
     $('#windows_hooks li a').click(function (e) {
         e.preventDefault();
         if ( $(this).parent('li').hasClass('active') ) {
diff --git a/applications/admin/views/default/todolist.load b/applications/admin/views/default/todolist.load
index 00aceb92..9c3e3dcf 100644
--- a/applications/admin/views/default/todolist.load
+++ b/applications/admin/views/default/todolist.load
@@ -1,13 +1,16 @@
 <div>
 <!--div class="page-header"-->
-    <h4>TODO</h4>
+    {{n_todo=reduce(lambda x,y: x + len(y['matches']), todo, 0)}}
+    <h4>{{="%s TODO in %s" % (n_todo, app)}}</h4>
 <!--/div-->
-<ul class="nav nav-list small-font">
+<ul class="nav nav-list cm-s-web2py">
     {{for pos_file, file in enumerate(todo):}}
         <li onclick="collapse('{{=pos_file}}_matches');"><a ><i class='icon-chevron-right'></i>{{=file['filename']}} <span class='small'>({{=len(file['matches'])}} TODO)</span></a></li>
-        <li id="{{=pos_file}}_matches" style="display: none;"><ul class="nav nav-list small-font">
+        <li id="{{=pos_file}}_matches" style="display: none;"><ul class="nav nav-list">
             {{for m in file['matches']:}}
-                <li><a href="{{=URL('edit', args=[app,file['dir'], file['filename']], vars={'lineno':m['lineno']}, extension="")}}" data-lineno="{{=m['lineno']-1}}" class="editor_filelink" >{{=m['text']}}</a></li>
+                <li><a href="{{=URL('edit', args=[app,file['dir'], file['filename']], vars={'lineno':m['lineno']}, extension="")}}" data-lineno="{{=m['lineno']-1}}" class="editor_filelink">
+                    <span class='cm-comment'>{{=m['text']}}</span>
+                </a></li>
             {{pass}}
         </ul></li>
     {{pass}}