diff --git a/src/main/java/se/su/dsv/scipro/admin/pages/ProjectManagementPage.java b/src/main/java/se/su/dsv/scipro/admin/pages/ProjectManagementPage.java
index d65df45826..5b2c7d475d 100644
--- a/src/main/java/se/su/dsv/scipro/admin/pages/ProjectManagementPage.java
+++ b/src/main/java/se/su/dsv/scipro/admin/pages/ProjectManagementPage.java
@@ -82,7 +82,6 @@ public class ProjectManagementPage extends AbstractAdminPage {
             @Override
             public void onUpdateFilter(AjaxRequestTarget target) {
                 target.addComponent(genericDataPanel.getWMC());
-                genericDataPanel.getWMC().replace(new Label("countLabel", String.valueOf(genericDataPanel.getSize())));
             }
         });
 
diff --git a/src/main/java/se/su/dsv/scipro/datatables/activityplantemplate/ActivityPlanTemplateDataPanel.java b/src/main/java/se/su/dsv/scipro/datatables/activityplantemplate/ActivityPlanTemplateDataPanel.java
index 8f18b1e127..582fe2e3b7 100644
--- a/src/main/java/se/su/dsv/scipro/datatables/activityplantemplate/ActivityPlanTemplateDataPanel.java
+++ b/src/main/java/se/su/dsv/scipro/datatables/activityplantemplate/ActivityPlanTemplateDataPanel.java
@@ -79,7 +79,6 @@ public abstract class ActivityPlanTemplateDataPanel extends Panel {
             @Override
             public void onUpdateFilter(AjaxRequestTarget target) {
                 target.addComponent(dataPanel.getWMC());
-                dataPanel.getWMC().replace(new Label("countLabel", new Model<String>(String.valueOf(safeLongToInt(dataPanel.getSize())))));
                 target.addComponent(wmc);
             }
         };
@@ -89,7 +88,6 @@ public abstract class ActivityPlanTemplateDataPanel extends Panel {
             @Override
             protected void onUpdate(AjaxRequestTarget target) {
                 target.addComponent(dataPanel.getWMC());
-                dataPanel.getWMC().replace(new Label("countLabel", new Model<String>(String.valueOf(safeLongToInt(dataPanel.getSize())))));
                 target.addComponent(wmc);
             }
         };
diff --git a/src/main/java/se/su/dsv/scipro/datatables/checklisttemplate/CheckListTemplateDataPanel.html b/src/main/java/se/su/dsv/scipro/datatables/checklisttemplate/CheckListTemplateDataPanel.html
index ad9c8e81b1..ac1cafa47b 100644
--- a/src/main/java/se/su/dsv/scipro/datatables/checklisttemplate/CheckListTemplateDataPanel.html
+++ b/src/main/java/se/su/dsv/scipro/datatables/checklisttemplate/CheckListTemplateDataPanel.html
@@ -11,7 +11,7 @@
 
             <button wicket:id="newLink">Create new</button>
         </div>
-        <div><span class="left">Checklist templates found: <span wicket:id="countLabel"></span></span><span class="right">Rows per page: <span wicket:id="numberDropDown"></span></span></div>
+        <div><span class="right">Rows per page: <span wicket:id="numberDropDown"></span></span></div>
         <table wicket:id="datatable"></table>
     </div>
 </wicket:panel>
diff --git a/src/main/java/se/su/dsv/scipro/datatables/checklisttemplate/CheckListTemplateDataPanel.java b/src/main/java/se/su/dsv/scipro/datatables/checklisttemplate/CheckListTemplateDataPanel.java
index 75f98d0949..58bb32c84e 100644
--- a/src/main/java/se/su/dsv/scipro/datatables/checklisttemplate/CheckListTemplateDataPanel.java
+++ b/src/main/java/se/su/dsv/scipro/datatables/checklisttemplate/CheckListTemplateDataPanel.java
@@ -2,6 +2,7 @@ package se.su.dsv.scipro.datatables.checklisttemplate;
 
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxNavigationToolbar;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.*;
 import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -36,7 +37,7 @@ public abstract class CheckListTemplateDataPanel extends Panel {
     CheckListTemplateDataPanel cltdp; //must be kept as a reference to self for abstract method cascading
 
     DataTable<CheckListTemplate> table;
-    NavigationToolbar navigationToolbar;
+    AjaxNavigationToolbar navigationToolbar;
     FilterStringPanel filterStringPanel;
     Integer number;
     AjaxDropDown<Integer> numberDropDown;
@@ -45,8 +46,6 @@ public abstract class CheckListTemplateDataPanel extends Panel {
 
     WebMarkupContainer wmc;
 
-    Label countLabel;
-
     public abstract void onClick(IModel<CheckListTemplate> clicked, AjaxRequestTarget target);
 
     public CheckListTemplateDataPanel(String id, boolean adminPrivileges) {
@@ -71,7 +70,6 @@ public abstract class CheckListTemplateDataPanel extends Panel {
             @Override
             public void onUpdateFilter(AjaxRequestTarget target) {
                 target.addComponent(table);
-                wmc.replace(new Label("countLabel", new Model<String>(String.valueOf(safeLongToInt(checklistTemplateProvider.size())))));
                 target.addComponent(wmc);
             }
         };
@@ -134,12 +132,11 @@ public abstract class CheckListTemplateDataPanel extends Panel {
 
         table = new DataTable<CheckListTemplate>("datatable", columns, checklistTemplateProvider =  new ChecklistTemplateProvider(), 10);
         table.setOutputMarkupId(true);
-        table.addBottomToolbar(navigationToolbar = new NavigationToolbar(table));
+        table.addBottomToolbar(navigationToolbar = new AjaxNavigationToolbar(table));
+        table.addTopToolbar(navigationToolbar = new AjaxNavigationToolbar(table));
         table.addTopToolbar(new HeadersToolbar(table, checklistTemplateProvider));
         wmc.add(table);
 
-        wmc.add(countLabel = new Label("countLabel", new Model<String>(String.valueOf(safeLongToInt(checklistTemplateProvider.size())))));
-        countLabel.setOutputMarkupId(true);
 
     }
 
diff --git a/src/main/java/se/su/dsv/scipro/datatables/project/GenericDataPanel.html b/src/main/java/se/su/dsv/scipro/datatables/project/GenericDataPanel.html
index 61737c8561..efb379f6ef 100644
--- a/src/main/java/se/su/dsv/scipro/datatables/project/GenericDataPanel.html
+++ b/src/main/java/se/su/dsv/scipro/datatables/project/GenericDataPanel.html
@@ -4,8 +4,8 @@
 <body>
 <wicket:panel>
     <div wicket:id="wmc">
+        <div class="right">Rows per page: <span wicket:id="numberDropDown"></span></div>
         <div> &nbsp; </div>
-        <div><span class="left">Found: <span wicket:id="countLabel"></span></span><span class="right">Rows per page: <span wicket:id="numberDropDown"></span></span></div>
         <table wicket:id="datatable"></table>
     </div>
 </wicket:panel>
diff --git a/src/main/java/se/su/dsv/scipro/datatables/project/GenericDataPanel.java b/src/main/java/se/su/dsv/scipro/datatables/project/GenericDataPanel.java
index 7534a8d529..fa03f940b5 100644
--- a/src/main/java/se/su/dsv/scipro/datatables/project/GenericDataPanel.java
+++ b/src/main/java/se/su/dsv/scipro/datatables/project/GenericDataPanel.java
@@ -30,7 +30,6 @@ import java.util.Iterator;
 public abstract class GenericDataPanel<T extends Serializable> extends Panel {
 
     private WebMarkupContainer wmc;
-    private Label countLabel;
     private Integer number;
     private AjaxDropDown<Integer> numberDropDown;
     private DataTable<T> table;
@@ -137,12 +136,10 @@ public abstract class GenericDataPanel<T extends Serializable> extends Panel {
         table = new DataTable<T>("datatable", getColumns(), provider =  new Provider(), 10);
         table.setOutputMarkupId(true);
         table.addBottomToolbar(navigationToolbar = new AjaxNavigationToolbar(table));
+        table.addTopToolbar(navigationToolbar = new AjaxNavigationToolbar(table));
         table.addTopToolbar(new HeadersToolbar(table, provider));
         wmc.add(table);
 
-        wmc.add(countLabel = new Label("countLabel", new Model<String>(String.valueOf(safeLongToInt(provider.size())))));
-        countLabel.setOutputMarkupId(true);
-
     }
 
     private class Provider extends SortableDataProvider<T> {