diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af-ZA.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af-ZA.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar-SA.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar-SA.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg-BG.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg-BG.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca-ES.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca-ES.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs-CZ.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs-CZ.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da-DK.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da-DK.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de-DE.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de-DE.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el-GR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el-GR.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-ES.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-ES.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et-EE.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et-EE.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu-EU.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu-EU.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa-IR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa-IR.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi-FI.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi-FI.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-FR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-FR.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he-IL.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he-IL.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr-HR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr-HR.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu-HU.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu-HU.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id-ID.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id-ID.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it-IT.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it-IT.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja-JP.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja-JP.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka-GE.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka-GE.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko-KR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko-KR.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-NL.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-NL.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl-PL.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl-PL.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-BR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt_BR.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-BR.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt_BR.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro-RO.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro-RO.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru-RU.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru-RU.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk-SK.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk-SK.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv-SE.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv-SE.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr-TR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr-TR.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk-UA.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk-UA.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk.min.js
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh_Hans_CN.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js
rename to cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh_Hans_CN.min.js
diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index a38ca1c61..577b8d8c1 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -136,10 +136,11 @@ $(function() {
 
     $("#books-table").bootstrapTable({
         sidePagination: "server",
+        pageList: "[10, 25, 50, 100]",
         queryParams: queryParams,
         pagination: true,
         paginationLoop: false,
-        paginationDetailHAlign: " hidden",
+        paginationDetailHAlign: "right",
         paginationHAlign: "left",
         idField: "id",
         uniqueId: "id",
diff --git a/cps/templates/book_table.html b/cps/templates/book_table.html
index e340dc0a0..ea978eb61 100644
--- a/cps/templates/book_table.html
+++ b/cps/templates/book_table.html
@@ -97,5 +97,9 @@
 <script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table.min.js') }}"></script>
 <script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table-editable.min.js') }}"></script>
 <script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-editable.min.js') }}"></script>
+{% if not g.user.locale == 'en' %}
+<script src="{{ url_for('static', filename='js/libs/bootstrap-table/locale/bootstrap-table-' + g.user.locale + '.min.js') }}" charset="UTF-8"></script>
+{% endif %}
+
 <script src="{{ url_for('static', filename='js/table.js') }}"></script>
 {% endblock %}
diff --git a/cps/templates/tasks.html b/cps/templates/tasks.html
index 4a755c826..5cc15f876 100644
--- a/cps/templates/tasks.html
+++ b/cps/templates/tasks.html
@@ -21,8 +21,6 @@
         </tr>
       </thead>
     </table>
-  <!--div class="btn btn-default" id="tasks_delete">{{_('Delete finished tasks')}}</div>
-  <div class="btn btn-default" id="tasks_hide">{{_('Hide all tasks')}}</div-->
 </div>
 {% endblock %}
 {% block js %}