diff --git a/app/controllers/community_solutions_controller.rb b/app/controllers/community_solutions_controller.rb
index d26b728f..07289e10 100644
--- a/app/controllers/community_solutions_controller.rb
+++ b/app/controllers/community_solutions_controller.rb
@@ -11,7 +11,7 @@ class CommunitySolutionsController < ApplicationController
 
   # GET /community_solutions
   def index
-    @community_solutions = CommunitySolution.all
+    @community_solutions = CommunitySolution.all.paginate(page: params[:page], per_page: per_page_param)
     authorize!
   end
 
@@ -85,7 +85,7 @@ class CommunitySolutionsController < ApplicationController
   private
 
   def authorize!
-    authorize(@community_solution)
+    authorize(@community_solution || @community_solutions)
   end
 
   # Use callbacks to share common setup or constraints between actions.
diff --git a/app/views/community_solutions/index.html.slim b/app/views/community_solutions/index.html.slim
index 97046122..1a01711c 100644
--- a/app/views/community_solutions/index.html.slim
+++ b/app/views/community_solutions/index.html.slim
@@ -1,19 +1,16 @@
-h1 Listing community_solutions
+h1 = t('activerecord.models.community_solution.other')
 
-table
-  thead
-    tr
-      th
-      th
-      th
-
-  tbody
-    - @community_solutions.each do |community_solution|
+.table-responsive
+  table.table.mt-4
+    thead
       tr
-        td = link_to 'Show', community_solution
-        td = link_to 'Edit', edit_community_solution_path(community_solution)
-        td = link_to 'Destroy', community_solution, data: { confirm: 'Are you sure?' }, method: :delete
+        th = t('activerecord.attributes.exercise.title')
+        th colspan=1 = t('shared.actions')
 
-br
+    tbody
+      - @community_solutions.each do |community_solution|
+        tr
+          td = community_solution.exercise.title
+          td = link_to 'Edit', edit_community_solution_path(community_solution)
 
-= link_to 'New Community solution', new_community_solution_path
+= render('shared/pagination', collection: @community_solutions)