diff --git a/module/Pool/view/pool/pool/details.phtml b/module/Pool/view/pool/pool/details.phtml
index 69f53d46..bb65840c 100644
--- a/module/Pool/view/pool/pool/details.phtml
+++ b/module/Pool/view/pool/pool/details.phtml
@@ -50,7 +50,7 @@ $this->headTitle($title);
 
 <div class="panel-body">
 
-<table class="table table-hover" id="pool">
+<table class="table table-no-bordered table-hover" id="pool">
 
 <thead class="bg-primary">
    <th><?php echo $this->translate("Name"); ?></th>
@@ -81,10 +81,9 @@ $this->headTitle($title);
 
 <div class="panel-body">
 
-<table class="table table-hover" id="volumes">
+<table class="table table-no-bordered table-hover" id="vols">
 
 <thead class="bg-primary">
-   <th></th>
    <th><?php echo $this->translate("Name"); ?></th>
    <th><?php echo $this->translate("Storage"); ?></th>
    <th><?php echo $this->translate("Type"); ?></th>
@@ -103,10 +102,11 @@ $this->headTitle($title);
 </div>
 
 <?php
-   echo $this->headScript()->prependFile($this->basePath() . '/js/datatables.plugins.js');
    echo $this->headScript()->prependFile($this->basePath() . '/js/datatables.functions.js');
-   echo $this->headScript()->prependFile($this->basePath() . '/js/datatables.min.js');
-   echo $this->headLink()->prependStylesheet($this->basePath() . '/css/datatables.min.css');
+   echo $this->headLink()->prependStylesheet($this->basePath() . '/css/bootstrap-table.min.css');
+   echo $this->headScript()->prependFile($this->basePath() . '/js/bootstrap-table-locale-all.min.js');
+   echo $this->headScript()->prependFile($this->basePath() . '/js/bootstrap-table-cookie.min.js');
+   echo $this->headScript()->prependFile($this->basePath() . '/js/bootstrap-table.min.js');
 ?>
 
 <!-- modal-001 start -->
@@ -129,188 +129,164 @@ $this->headTitle($title);
 </div>
 <!-- modal-001 end -->
 
-<style>
-
-td.details-control:after {
-   font-family: "Glyphicons Halflings";
-   content: "\e081";
-   cursor: pointer;
-}
-
-tr.shown td.details-control:after {
-   font-family: "Glyphicons Halflings";
-   content: "\e082";
-   cursor: pointer;
-}
-
-</style>
-
 <script>
 
-function format( d ) {
-   return '<table class="table table-bordered">'+
-      '<tr>'+
-      '<th><?php echo $this->translate("Label date"); ?></th>'+
-      '<td>'+ d.labeldate +'</td>'+
-      '</tr>'+
-      '<tr>'+
-      '<th><?php echo $this->translate("First written"); ?></th>'+
-      '<td>'+ d.firstwritten +'</td>'+
-      '</tr>'+
-      '<tr>'+
-      '<th><?php echo $this->translate("Last written"); ?></th>'+
-      '<td>'+ d.lastwritten +'</td>'+
-      '</tr>'+
-      '<tr>'+
-      '<th><?php echo $this->translate("Volume jobs"); ?></th>'+
-      '<td>'+ d.voljobs +'</td>'+
-      '</tr>'+
-      '<tr>'+
-      '<th><?php echo $this->translate("Recycle"); ?></th>'+
-      '<td>'+ formatRecycle(d.recycle) +'</td>'+
-      '</tr>'+
-      '</table>';
-}
-
-$(document).ready(function() {
-
-   setDtTextDomain('<?php echo $this->basePath() . '/js/locale'; ?>');
-   setDtLocale('<?php echo $_SESSION['bareos']['locale']; ?>');
-
-   var tab_pool = $('#pool').DataTable( {
-      "ajax": {
-         "url": "<?php echo $this->url('pool', array('action' => 'getData'), null) . '?data=details&pool='.$this->pool; ?>",
-         "dataSrc": ""
-      },
-      "language": {
-         "url": "<?php echo $this->basePath() . '/js/dataTables/language/'; ?>" + getLocale('<?php echo $_SESSION['bareos']['locale']; ?>')
-      },
-      "columns" : [
-         { "data": "name" },
-         { "data": "pooltype" },
-         { "data": "numvols" },
-         { "data": "maxvols" },
-         { "data": "volretention" },
-         { "data": "maxvoljobs" },
-         { "data": "maxvolbytes" }
-      ],
-      "paging": false,
-      "ordering": false,
-      "info": false,
-      "pagingType": "full_numbers",
-      "stateSave": true,
-      "bFilter": false,
-      "columnDefs": [
-         {
-            "targets": 4,
-            "render": function(data, type, full, meta) {
-               return formatRetention(data);
-            }
-         },
-         {
-            "targets": 6,
-            "render": function(data, type, full, meta) {
-               return formatBytes(data);
-            }
-         }
-      ]
-
-   } );
-
-   var tab_volumes = $('#volumes').DataTable( {
-      "ajax": {
-         "url": "<?php echo $this->url('pool', array('action' => 'getData'), null) . '?data=volumes&pool='.$this->pool; ?>",
-         "dataSrc": ""
-      },
-      "language": {
-         "url": "<?php echo $this->basePath() . '/js/dataTables/language/'; ?>" + getLocale('<?php echo $_SESSION['bareos']['locale']; ?>')
-      },
-      "columns": [
-         { "data": null, "orderable": false, "defaultContent": '', "className": 'details-control' },
-         { "data": "volumename" },
-         { "data": "storage" },
-         { "data": "mediatype" },
-         { "data": "lastwritten" },
-         { "data": "volstatus" },
-         { "data": null },
-         { "data": "maxvolbytes", "type": "file-size" },
-         { "data": "volbytes", "type": "file-size" },
-         { "data": "lastwritten" }
-      ],
-      "paging": true,
-      "pagingType": "full_numbers",
-      "lengthMenu": [ <?php echo $_SESSION['bareos']['dt_lengthmenu']; ?> ],
-      "pageLength": <?php echo $_SESSION['bareos']['dt_pagelength']; ?>,
-      "stateSave": <?php echo $_SESSION['bareos']['dt_statesave']; ?>,
-      "ordering": true,
-      "info": true,
-      "order": [[4, 'desc']],
-      "columnDefs": [
-         {
-            "targets": 1,
-            "render": function(data, type, full, meta) {
-               return '<a href="<?php echo $this->basePath() . '/media/details/'; ?>'+data+'">'+data+'</a>';
-            }
-         },
-         {
-            "targets": 4,
-            "orderData": 9,
-            "render": function(data, type, full, meta) {
-               return formatLastWritten(data);
-            }
-         },
-         {
-            "targets": 6,
-            "render": function(data, type, full, meta) {
-               return formatExpiration(data.volstatus, data.lastwritten, data.volretention);
-            }
-         },
-         {
-            "targets": 7,
-            "render": function(data, type, full, meta) {
-               return formatBytes(data);
+   var pool = null;
+   var vols = null;
+
+   function getPool() {
+      pool = $('#pool').bootstrapTable({
+         locale: '<?php echo str_replace('_','-', $_SESSION['bareos']['locale']); ?>',
+         url: '<?php echo $this->url('pool', array('action' => 'getData'), null) . '?data=details&pool='.$this->pool; ?>',
+         method: 'get',
+         dataType: 'json',
+         columns: [
+            {
+               field: 'name',
+            },
+            {
+               field: 'pooltype',
+            },
+            {
+               field: 'numvols',
+            },
+            {
+               field: 'maxvols',
+            },
+            {
+               field: 'volretention',
+               formatter: function(value) {
+                  return formatRetention(value);
+               }
+            },
+            {
+               field: 'maxvoljobs',
+            },
+            {
+               field: 'maxvolbytes',
+               formatter: function(value) {
+                  return formatBytes(value);
+               }
             }
-         },
-         {
-            "targets": 8,
-            "render": function(data, type, full, meta) {
-               return formatBytes(data);
+         ]
+      });
+   }
+
+   function getVols() {
+      vols = $('#vols').bootstrapTable({
+         locale: '<?php echo str_replace('_','-', $_SESSION['bareos']['locale']); ?>',
+         cookie: <?php echo $_SESSION['bareos']['dt_statesave']; ?>,
+         cookieIdTable: 'pool_volumes',
+         url: '<?php echo $this->url('pool', array('action' => 'getData'), null) . '?data=volumes&pool='.$this->pool; ?>',
+         method: 'get',
+         dataType: 'json',
+         pagination : true,
+         sidePagination: 'client',
+         pageList: [ <?php echo $_SESSION['bareos']['dt_lengthmenu']; ?> ],
+         pageSize: <?php echo $_SESSION['bareos']['dt_pagelength']; ?>,
+         search: true,
+         showToggle: true,
+         showPaginationSwitch: true,
+         showColumns: true,
+         showRefresh: true,
+         sortName: 'volumename',
+         sortOrder: 'asc',
+         detailView: true,
+         detailFormatter: 'detailFormatterVolume',
+         columns: [
+            {
+               field: 'volumename',
+               sortable: true,
+               formatter: function(value) {
+                  return '<a href="<?php echo $this->basePath() . '/media/details/'; ?>'+value+'">'+value+'</a>';
+               }
+            },
+            {
+               field: 'storage',
+               sortable: true,
+            },
+            {
+               field: 'mediatype',
+               sortable: true,
+            },
+            {
+               field: 'lastwritten',
+               sortable: true,
+               formatter: function(value) {
+                  return formatLastWritten(value);
+               }
+            },
+            {
+               field: 'volstatus',
+               sortable: true,
+            },
+            {
+               field: 'retention',
+               sortable: true,
+               formatter: function(value, row, index) {
+                  return formatExpiration(row.volstatus, row.lastwritten, row.volretention);
+               }
+            },
+            {
+               field: 'maxvolbytes',
+               sortable: true,
+               formatter: function(value) {
+                  return formatBytes(value);
+               }
+            },
+            {
+               field: 'volbytes',
+               sortable: true,
+               formatter: function(value) {
+                  return formatBytes(value);
+               }
             }
-         },
-         {
-            "targets": 9,
-            "visible": false,
-            "searchable": false
-         }
-      ]
-   } );
-
-   $('#volumes tbody').on('mouseover', '#lastwritten', function () {
-      $('[data-toggle="tooltip"]').tooltip();
-   } );
-
-   $('#volumes tbody').on('click', 'td.details-control', function () {
-      var tr = $(this).closest('tr');
-      var row = tab_volumes.row( tr );
-      if ( row.child.isShown() ) {
-         // This row is already open - close it
-         row.child.hide();
-         tr.removeClass('shown');
-      }
-      else {
-         // Open this row
-         row.child( format(row.data()) ).show();
-         tr.addClass('shown');
-      }
-   } );
-
-   $.fn.dataTable.ext.errMode = 'throw';
-
-   $('#volumes').on('error.dt', function(e, settings, techNote, message) {
-      $("#modal-001").modal();
-   } );
-
-} );
+         ]
+      });
+   }
+
+   function detailFormatterVolume(index, row) {
+      var html = [];
+      html.push('<div class="container-fluid">');
+      html.push('<table class="table table-bordered">');
+      html.push('<tr>');
+      html.push('<th><?php echo $this->translate("Label date"); ?></th>');
+      html.push('<td>' + row.labeldate + '</td>');
+      html.push('</tr>');
+      html.push('<tr>');
+      html.push('<th><?php echo $this->translate("First written"); ?></th>');
+      html.push('<td>' + row.firstwritten + '</td>');
+      html.push('</tr>');
+      html.push('<tr>');
+      html.push('<th><?php echo $this->translate("Last written"); ?></th>');
+      html.push('<td>' + row.lastwritten + '</td>');
+      html.push('</tr>');
+      html.push('<tr>');
+      html.push('<th><?php echo $this->translate("Volume jobs"); ?></th>');
+      html.push('<td>' + row.voljobs + '</td>');
+      html.push('</tr>');
+      html.push('<tr>');
+      html.push('<th><?php echo $this->translate("Recycle"); ?></th>');
+      html.push('<td>' + formatRecycle(row.recycle) + '</td>');
+      html.push('</tr>');
+      html.push('</table>');
+      html.push('</div>');
+      return html.join('');
+   }
+
+   $(document).ready(function() {
+
+      setDtTextDomain('<?php echo $this->basePath() . '/js/locale'; ?>');
+      setDtLocale('<?php echo $_SESSION['bareos']['locale']; ?>');
+
+      getPool();
+      getVols();
+
+      $('#vols').on('load-error.bs.table', function(status, res) {
+         $("#modal-001").modal();
+      });
+
+   });
 
 </script>
 
diff --git a/module/Pool/view/pool/pool/index.phtml b/module/Pool/view/pool/pool/index.phtml
index a9f81949..8ced1d77 100644
--- a/module/Pool/view/pool/pool/index.phtml
+++ b/module/Pool/view/pool/pool/index.phtml
@@ -5,9 +5,8 @@
  * bareos-webui - Bareos Web-Frontend
  *
  * @link      https://github.com/bareos/bareos-webui for the canonical source repository
- * @copyright Copyright (c) 2013-2015 Bareos GmbH & Co. KG (http://www.bareos.org/)
+ * @copyright Copyright (c) 2013-2017 Bareos GmbH & Co. KG (http://www.bareos.org/)
  * @license   GNU Affero General Public License (http://www.gnu.org/licenses/)
- * @author    Frank Bergkemper
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -50,7 +49,7 @@ $this->headTitle($title);
 
 <div class="panel-body">
 
-<table class="table table-hover" id="pools">
+<table class="table table-no-bordered table-hover" id="pools">
 
 <thead class="bg-primary">
    <th><?php echo $this->translate("Name"); ?></th>
@@ -70,70 +69,82 @@ $this->headTitle($title);
 </div>
 
 <?php
-   echo $this->headScript()->prependFile($this->basePath() . '/js/datatables.plugins.js');
    echo $this->headScript()->prependFile($this->basePath() . '/js/datatables.functions.js');
-   echo $this->headScript()->prependFile($this->basePath() . '/js/datatables.min.js');
-   echo $this->headLink()->prependStylesheet($this->basePath() . '/css/datatables.min.css');
+   echo $this->headLink()->prependStylesheet($this->basePath() . '/css/bootstrap-table.min.css');
+   echo $this->headScript()->prependFile($this->basePath() . '/js/bootstrap-table-locale-all.min.js');
+   echo $this->headScript()->prependFile($this->basePath() . '/js/bootstrap-table-cookie.min.js');
+   echo $this->headScript()->prependFile($this->basePath() . '/js/bootstrap-table.min.js');
 ?>
 
 <script>
 
-$(document).ready(function() {
-   setDtTextDomain('<?php echo $this->basePath() . '/js/locale'; ?>');
-   setDtLocale('<?php echo $_SESSION['bareos']['locale']; ?>');
-
-   var table= $('#pools').DataTable( {
-      "ajax": {
-         "url": "<?php echo $this->url('pool', array('action' => 'getData'), null) . '?data=all'; ?>",
-         "dataSrc": ""
-      },
-      "language": {
-            "url": "<?php echo $this->basePath() . '/js/dataTables/language/'; ?>" + getLocale('<?php echo $_SESSION['bareos']['locale']; ?>')
-      },
-      "columns" : [
-         { "data": "name" },
-         { "data": "pooltype" },
-         { "data": "numvols" },
-         { "data": "maxvols" },
-         { "data": "volretention" },
-         { "data": "maxvoljobs" },
-         { "data": "maxvolbytes", "type": "file-size" },
-         { "data": "volretention" }
-      ],
-      "paging": true,
-      "pagingType": "full_numbers",
-      "stateSave": true,
-      "ordering": true,
-      "info": true,
-      "order": [[0, 'asc']],
-      "columnDefs": [
-         {
-            "targets": 0,
-            "render": function(data, type, full, meta) {
-               return '<a href="<?php echo $this->basePath() . '/pool/details/'; ?>'+data+'">'+data+'</a>';
+   var pools = null;
+
+   function getPools() {
+      pools = $('#pools').bootstrapTable({
+         locale: '<?php echo str_replace('_','-', $_SESSION['bareos']['locale']); ?>',
+         cookie: <?php echo $_SESSION['bareos']['dt_statesave']; ?>,
+         cookieIdTable: 'pool_index',
+         url: '<?php echo $this->url('pool', array('action' => 'getData'), null) . '?data=all'; ?>',
+         method: 'get',
+         dataType: 'json',
+         pagination : true,
+         sidePagination: 'client',
+         pageList: [ <?php echo $_SESSION['bareos']['dt_lengthmenu']; ?> ],
+         pageSize: <?php echo $_SESSION['bareos']['dt_pagelength']; ?>,
+         search: true,
+         showPaginationSwitch: true,
+         showColumns: true,
+         showRefresh: true,
+         sortName: 'name',
+         sortOrder: 'asc',
+         columns: [
+            {
+               field: 'name',
+               sortable: true,
+               formatter: function(value) {
+                  return '<a href="<?php echo $this->basePath() . '/pool/details/'; ?>'+value+'">'+value+'</a>';
+               }
+            },
+            {
+               field: 'pooltype',
+               sortable: true,
+            },
+            {
+               field: 'numvols',
+               sortable: true,
+            },
+            {
+               field: 'maxvols',
+               sortable: true,
+            },
+            {
+               field: 'volretention',
+               sortable: true,
+               formatter: function(value) {
+                  return formatRetention(value);
+               }
+            },
+            {
+               field: 'maxvoljobs',
+               sortable: true,
+            },
+            {
+               field: 'maxvolbytes',
+               sortable: true,
+               formatter: function(value) {
+                  return formatBytes(value);
+               }
             }
-         },
-         {
-            "targets": 4,
-            "orderData": 7,
-            "render": function(data, type, full, meta) {
-               return formatRetention(data);
-            }
-         },
-         {
-            "targets": 6,
-            "render": function(data, type, full, meta) {
-               return formatBytes(data);
-            }
-         },
-         {
-            "targets": 7,
-            "visible": false,
-            "searchable": false
-         }
-      ]
+         ]
+      });
+   }
+
+   $(document).ready(function() {
+      setDtTextDomain('<?php echo $this->basePath() . '/js/locale'; ?>');
+      setDtLocale('<?php echo $_SESSION['bareos']['locale']; ?>');
+      getPools();
    });
-});
 
 </script>