diff --git a/apps/common/templates/generic_list_subtemplate.html b/apps/common/templates/generic_list_subtemplate.html
index 64fadee451..083a06d085 100644
--- a/apps/common/templates/generic_list_subtemplate.html
+++ b/apps/common/templates/generic_list_subtemplate.html
@@ -26,6 +26,9 @@
 {% endif %}
 
         <form action="{% url multi_object_action_view %}" class="form" method="get">
+{% if scrollable_content %}
+        <div style="border: 1px solid black; height: {{ scrollable_content_height }}; overflow: auto;">
+{% endif %}
             <table class="table">
                 <tbody>
                     {% if not hide_header %}
@@ -86,6 +89,9 @@
                     {% endfor %}
                 </tbody>
             </table>
+{% if scrollable_content %}
+            </div>            
+{% endif %}            
             {% if multi_select or multi_select_as_buttons %}
                 {% if multi_select_as_buttons %}
                     {% get_multi_item_links as multi_item_links %}
@@ -108,7 +114,6 @@
                 {% endif %}
             {% endif %}  
         </form>
-            
         {% paginate %}
         
         {% if side_bar %}
diff --git a/settings.py b/settings.py
index 19a6659a3e..3d4372edd2 100644
--- a/settings.py
+++ b/settings.py
@@ -119,6 +119,7 @@ INSTALLED_APPS = (
     'django.contrib.messages',
     'django.contrib.admin',
     'django.contrib.admindocs',
+    'django.contrib.comments',
     'navigation',
     'web_theme',
     'main',
diff --git a/urls.py b/urls.py
index 74613393ea..87ae2ab05c 100644
--- a/urls.py
+++ b/urls.py
@@ -18,6 +18,7 @@ urlpatterns = patterns('',
     (r'^admin/', include(admin.site.urls)),
     (r'^grappelli/', include('grappelli.urls')),
     (r'^sentry/', include('sentry.urls')),
+    (r'^comments/', include('django.contrib.comments.urls')),
 )