diff --git a/app/controllers/admin/courses_controller.rb b/app/controllers/admin/courses_controller.rb
index 15157fc..1378bf0 100644
--- a/app/controllers/admin/courses_controller.rb
+++ b/app/controllers/admin/courses_controller.rb
@@ -14,7 +14,7 @@ module Admin
     # GET /admin/courses/1
     # GET /admin/courses/1.json
     def show
-      @weeks = @course.weeks
+      @weeks = @course.weeks.page(params[:page])
     end
 
     # GET /admin/courses/new
diff --git a/app/controllers/admin/weeks_controller.rb b/app/controllers/admin/weeks_controller.rb
index 19425ec..09a54c3 100644
--- a/app/controllers/admin/weeks_controller.rb
+++ b/app/controllers/admin/weeks_controller.rb
@@ -27,7 +27,7 @@ module Admin
     # POST /admin/weeks.json
     def create
       @week = Week.new(admin_week_params)
-      @course = Course.find(@week.course_id)
+      @course = @week.course# .find(@week.course_id)
       params[:course_id] = @course.id
       respond_to do |format|
         if @week.save
@@ -75,10 +75,11 @@ module Admin
     def set_object
       @week = Week.find(params[:id])
       @course = @week.course
+      params[:course_id] = @course.id
     end
 
     def collection
-      @weeks = Week.by_course(params[:course_id])
+      @weeks = Week.by_course(params[:course_id]).page(paramas[:page])
     end
 
     # Never trust parameters from the scary internet, only allow the white list through.
diff --git a/app/helpers/views_helper.rb b/app/helpers/views_helper.rb
index c6ff0ba..048c064 100644
--- a/app/helpers/views_helper.rb
+++ b/app/helpers/views_helper.rb
@@ -38,6 +38,19 @@ module ViewsHelper
     end
   end
 
+  def paginator(object)
+    paginate(object, remote: true, theme: 'twitter-bootstrap-4',
+                     pagination_class: 'justify-content-center',
+                     nav_class: 'pg-right', params: normalize_pagination_params)
+  end
+
+  def normalize_pagination_params
+    params.to_unsafe_h.inject({}) do |params_hash, p|
+      params_hash[p[0]] = nil unless p[0] == 'controller' || p[0] == 'search'
+      params_hash
+    end
+  end
+
 =begin
 <div class="dropdown no-arrow">
   <a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/app/views/admin/courses/partials/_courses.html.erb b/app/views/admin/courses/partials/_courses.html.erb
index 2146f83..28ec5a8 100644
--- a/app/views/admin/courses/partials/_courses.html.erb
+++ b/app/views/admin/courses/partials/_courses.html.erb
@@ -22,5 +22,5 @@
       <% end %>
     </tbody>
   </table>
-  <%= paginate @courses, remote: true, theme: 'twitter-bootstrap-4', pagination_class: 'justify-content-center' %>
+  <%= paginator @courses %>
 <% end %>
diff --git a/app/views/admin/courses/show.js.erb b/app/views/admin/courses/show.js.erb
new file mode 100644
index 0000000..7d5aa90
--- /dev/null
+++ b/app/views/admin/courses/show.js.erb
@@ -0,0 +1 @@
+$('#ajax_list').html("<%= escape_javascript(render('/admin/weeks/partials/weeks')) %>");
diff --git a/app/views/admin/weeks/index.js.erb b/app/views/admin/weeks/index.js.erb
new file mode 100644
index 0000000..7d5aa90
--- /dev/null
+++ b/app/views/admin/weeks/index.js.erb
@@ -0,0 +1 @@
+$('#ajax_list').html("<%= escape_javascript(render('/admin/weeks/partials/weeks')) %>");
diff --git a/app/views/admin/weeks/partials/_weeks.html.erb b/app/views/admin/weeks/partials/_weeks.html.erb
index 3a869f5..d415d04 100644
--- a/app/views/admin/weeks/partials/_weeks.html.erb
+++ b/app/views/admin/weeks/partials/_weeks.html.erb
@@ -22,4 +22,5 @@
       <% end %>
     </tbody>
   </table>
+  <%= paginator @weeks, params: { controller: 'admin/weeks', action: :index } %>
 <% end %>