diff --git a/src/home/views.py b/src/home/views.py
index 2530083..b5180fb 100644
--- a/src/home/views.py
+++ b/src/home/views.py
@@ -26,7 +26,7 @@ def index(request):
         count_types['thread'] = SearchQuerySet().filter(
             type='thread',
         ).count()
-
+        # TODO: this section should be inside trac app and only use it here
         if settings.TRAC_ENABLED:
             for type in ['changeset', 'attachment']:
                 count_types[type] = SearchQuerySet().filter(
diff --git a/src/search/views.py b/src/search/views.py
index 1633dfc..b1cc954 100644
--- a/src/search/views.py
+++ b/src/search/views.py
@@ -28,7 +28,7 @@ class ColabSearchView(SearchView):
                 ),
             },
         }
-
+        # TODO: Replace for a more generic plugin architecture
         if settings.TRAC_ENABLED:
             types['wiki'] = {
                 'name': _(u'Wiki'),
diff --git a/src/templates/base.html b/src/templates/base.html
index 671b35e..f9d80cc 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -90,6 +90,7 @@
                   {% endif %}
                   <li><a href="/roadmap">{% trans "Roadmap" %}</a></li>
                   <li><a href="/browser">{% trans "Browse Source" %}</a></li>
+                  <!-- TODO: Must be optional like trac and separated --!>
                   <li><a href="/ci">{% trans "Continuous Integration" %}</a></li>
                 </ul>
               </li>
--
libgit2 0.21.2