diff --git a/src/main/java/se/su/dsv/scipro/admin/panels/CheckListTemplateDataPanel.html b/src/main/java/se/su/dsv/scipro/admin/panels/CheckListTemplateDataPanel.html
index 3d819cb813..e702a6c194 100644
--- a/src/main/java/se/su/dsv/scipro/admin/panels/CheckListTemplateDataPanel.html
+++ b/src/main/java/se/su/dsv/scipro/admin/panels/CheckListTemplateDataPanel.html
@@ -4,6 +4,7 @@
 <body>
 	<wicket:panel>
         <div wicket:id="filterStringPanel"></div>
+        <div>Rows per page: <span wicket:id="numberDropDown"></span></div>
         <table wicket:id="datatable"></table>
 	</wicket:panel>
 </body>
diff --git a/src/main/java/se/su/dsv/scipro/admin/panels/CheckListTemplateDataPanel.java b/src/main/java/se/su/dsv/scipro/admin/panels/CheckListTemplateDataPanel.java
index 018d2ca0ae..c0431a0f80 100644
--- a/src/main/java/se/su/dsv/scipro/admin/panels/CheckListTemplateDataPanel.java
+++ b/src/main/java/se/su/dsv/scipro/admin/panels/CheckListTemplateDataPanel.java
@@ -9,6 +9,7 @@ import org.apache.wicket.model.Model;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.springframework.data.domain.PageRequest;
 import se.su.dsv.scipro.data.dataobjects.CheckListTemplate;
+import se.su.dsv.scipro.reusable.AjaxDropDown;
 import se.su.dsv.scipro.reusable.FilterStringPanel;
 import se.su.dsv.scipro.springdata.services.ChecklistTemplateService;
 
@@ -27,8 +28,11 @@ public class CheckListTemplateDataPanel extends Panel {
     DataTable<CheckListTemplate> table;
     NavigationToolbar navigationToolbar;
     FilterStringPanel filterStringPanel;
+    Integer number;
+    AjaxDropDown<Integer> numberDropDown;
     ChecklistTemplateProvider checklistTemplateProvider;
 
+
     public CheckListTemplateDataPanel(String id) {
         super(id);
 
@@ -41,6 +45,21 @@ public class CheckListTemplateDataPanel extends Panel {
         };
         add(filterStringPanel);
 
+        number = new Integer(10);
+        ArrayList<Integer> numberList = new ArrayList<Integer>();
+        numberList.add(new Integer(10));
+        numberList.add(new Integer(25));
+        numberList.add(new Integer(100));
+
+        numberDropDown = new AjaxDropDown<Integer>("numberDropDown", new Model<Integer>(number), new Model<ArrayList<Integer>>(numberList)) {
+            @Override
+            public void onNewSelection(AjaxRequestTarget target, Integer objectSelected) {
+                table.setRowsPerPage(objectSelected);
+                target.addComponent(table);
+            }
+        };
+        add(numberDropDown);
+
         IColumn[] columns = new IColumn[2];
 
 //        columns[0] = new PropertyColumn<CheckListTemplate>(Model.of("Name"), "name", "name");