diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
index 932c2894..e44e371a 100644
--- a/module/Application/config/module.config.php
+++ b/module/Application/config/module.config.php
@@ -133,30 +133,6 @@
             'label' => 'Dashboard',
             'route' => 'dashboard',
          ),
-         array(
-            'label' => 'Director',
-            'route' => 'director',
-         ),
-         array(
-            'label' => 'Filesets',
-            'route' => 'fileset',
-         ),
-         array(
-            'label' => 'Pools',
-            'route' => 'pool',
-         ),
-         array(
-            'label' => 'Volumes',
-            'route' => 'media',
-         ),
-         array(
-            'label' => 'Storages',
-            'route' => 'storage',
-         ),
-         array(
-            'label' => 'Clients',
-            'route' => 'client',
-         ),
          array(
             'label' => 'Jobs',
             'route' => 'job',
@@ -177,7 +153,35 @@
             'label' => 'Restore',
             'route' => 'restore',
          ),
+         array(
+            'label' => 'Clients',
+            'route' => 'client',
+         ),
+         array(
+            'label' => 'Storage',
+            'route' => 'storage',
+         ),
+         /*array(
+            'label' => 'Volumes',
+            'route' => 'media',
+         ),
+         array(
+            'label' => 'Pools',
+            'route' => 'pool',
+         ),*/
+         array(
+            'label' => 'Director',
+            'route' => 'director',
+         ),
+         /*array(
+            'label' => 'Filesets',
+            'route' => 'fileset',
+         ),
+         array(
+            'label' => 'Storages',
+            'route' => 'storage',
+         )*/
       ),
-    ),
+   ),
 );
 
diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
index c883ce05..bf439fb1 100644
--- a/module/Application/view/layout/layout.phtml
+++ b/module/Application/view/layout/layout.phtml
@@ -61,6 +61,8 @@ echo $this->doctype();
 
 <body>
 
+<div class="spinner" id="spinner"></div>
+
 <!-- TOP NAVBAR -->
 <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
    <div class="container-fluid">
@@ -112,6 +114,10 @@ echo $this->doctype();
 
 <?php echo $this->inlineScript() ?>
 
+<script>
+   $('#spinner').fadeOut('normal');
+</script>
+
 </body>
 
 </html>
diff --git a/module/Job/view/job/job/details.phtml b/module/Job/view/job/job/details.phtml
index ba14c0e7..5492513d 100644
--- a/module/Job/view/job/job/details.phtml
+++ b/module/Job/view/job/job/details.phtml
@@ -130,7 +130,7 @@ $(document).ready(function() {
          { "data": "jobid" },
          { "data": "name" },
          { "data": "client" },
-         { "data": "fileset" },
+         { "data": null },
          { "data": "type" },
          { "data": "level" },
          { "data": "poolname" }
@@ -142,6 +142,12 @@ $(document).ready(function() {
       "stateSave": true,
       "bFilter": false,
       "columnDefs": [
+         {
+            "targets": 3,
+            "render": function(data, type, full, meta) {
+               return '<a href="<?php echo $this->basePath() . '/fileset/details/'; ?>'+data.filesetid+'">'+data.fileset+'</a>';
+            }
+         },
          {
             "targets": 4,
             "render": function(data, type, full, meta) {
diff --git a/module/Job/view/job/job/run.phtml b/module/Job/view/job/job/run.phtml
index 7aff54f4..7430ca30 100644
--- a/module/Job/view/job/job/run.phtml
+++ b/module/Job/view/job/job/run.phtml
@@ -38,7 +38,7 @@ $this->headTitle($title);
 
 <div class="row">
 
-<div class="col-md-10">
+<div class="col-md-6">
 
 <div class="panel panel-default">
 
diff --git a/module/Media/view/media/media/details.phtml b/module/Media/view/media/media/details.phtml
index 67a431c1..8258392e 100644
--- a/module/Media/view/media/media/details.phtml
+++ b/module/Media/view/media/media/details.phtml
@@ -29,6 +29,14 @@ $this->headTitle($title);
 
 ?>
 
+<ul class="nav nav-tabs">
+   <li><a href="<?php echo $this->url('storage', array('action'=>'index')); ?>"><?php echo $this->translate('Devices'); ?></a></li>
+   <li><a href="<?php echo $this->url('pool', array('action'=>'index')); ?>"><?php echo $this->translate('Pools'); ?></a></li>
+   <li class="active"><a href="<?php echo $this->url('media', array('action'=>'index')); ?>"><?php echo $this->translate('Volumes'); ?></a></li>
+</ul>
+
+<br />
+
 <div class="row">
 
 <div class="col-md-8">
diff --git a/module/Media/view/media/media/index.phtml b/module/Media/view/media/media/index.phtml
index 96830cec..b80dd412 100644
--- a/module/Media/view/media/media/index.phtml
+++ b/module/Media/view/media/media/index.phtml
@@ -29,6 +29,14 @@ $this->headTitle($title);
 
 ?>
 
+<ul class="nav nav-tabs">
+   <li><a href="<?php echo $this->url('storage', array('action'=>'index')); ?>"><?php echo $this->translate('Devices'); ?></a></li>
+   <li><a href="<?php echo $this->url('pool', array('action'=>'index')); ?>"><?php echo $this->translate('Pools'); ?></a></li>
+   <li class="active"><a href="<?php echo $this->url('media', array('action'=>'index')); ?>"><?php echo $this->translate('Volumes'); ?></a></li>
+</ul>
+
+<br />
+
 <div class="row">
 
 <div class="col-md-12">
@@ -148,10 +156,6 @@ $(document).ready(function() {
       "order": [[4, "desc"]],
       "searching": true,
       "info": false,
-      /*"select": {
-         "style": "os",
-         "blurable": true
-      },*/
       "columns": [
          { "data": null, "orderable": false, "defaultContent": '', "className": 'details-control' },
          { "data": "volumename" },
@@ -209,58 +213,8 @@ $(document).ready(function() {
             "searchable": false
          }
       ],
-      "buttons": [/*
-         {
-            "text": '<span class="glyphicon glyphicon-trash" aria-hidden="true"></span>' + ' Delete',
-            "action": function(e, dt, node, conf) {
-               var sel_volumes = $.map(volumes.rows('.selected').data(), function(item) {
-                  return item['volumename'];
-               });
-
-               alert(sel_volumes);
-            }
-         },
-         {
-            "text": '<span class="glyphicon glyphicon-trash" aria-hidden="true"></span>' + ' Purge',
-            "action": function(e, dt, node, conf) {
-               var sel_volumes = $.map(volumes.rows('.selected').data(), function(item) {
-                  return item['volumename'];
-               });
-
-               alert(sel_volumes);
-            }
-         },
-         {
-            "text": '<span class="glyphicon glyphicon-trash" aria-hidden="true"></span>' + ' Prune',
-            "action": function(e, dt, node, conf) {
-               var sel_volumes = $.map(volumes.rows('.selected').data(), function(item) {
-                  return item['volumename'];
-               });
-
-               alert(sel_volumes);
-            }
-         },
-         {
-            "text": '<span class="glyphicon glyphicon-import" aria-hidden="true"></span>' + ' Import',
-            "action": function(e, dt, node, conf) {
-               var sel_volumes = $.map(volumes.rows('.selected').data(), function(item) {
-                  return item['volumename'];
-               });
-
-               alert(sel_volumes);
-            }
-         },
-         {
-            "text": '<span class="glyphicon glyphicon-export" aria-hidden="true"></span>' + ' Export',
-            "action": function(e, dt, node, conf) {
-               var sel_volumes = $.map(volumes.rows('.selected').data(), function(item) {
-                  return item['volumename'];
-               });
-
-               alert(sel_volumes);
-            }
-         },
-      */],
+      "buttons": [
+      ],
 
    } );
 
diff --git a/module/Pool/view/pool/pool/details.phtml b/module/Pool/view/pool/pool/details.phtml
index 74ea305e..9eac239b 100644
--- a/module/Pool/view/pool/pool/details.phtml
+++ b/module/Pool/view/pool/pool/details.phtml
@@ -29,6 +29,14 @@ $this->headTitle($title);
 
 ?>
 
+<ul class="nav nav-tabs">
+   <li><a href="<?php echo $this->url('storage', array('action'=>'index')); ?>"><?php echo $this->translate('Devices'); ?></a></li>
+   <li class="active"><a href="<?php echo $this->url('pool', array('action'=>'index')); ?>"><?php echo $this->translate('Pools'); ?></a></li>
+   <li><a href="<?php echo $this->url('media', array('action'=>'index')); ?>"><?php echo $this->translate('Volumes'); ?></a></li>
+</ul>
+
+<br />
+
 <!-- POOL -->
 <div class="row">
 
diff --git a/module/Pool/view/pool/pool/index.phtml b/module/Pool/view/pool/pool/index.phtml
index fc4e4cb0..9c082b95 100644
--- a/module/Pool/view/pool/pool/index.phtml
+++ b/module/Pool/view/pool/pool/index.phtml
@@ -29,6 +29,14 @@ $this->headTitle($title);
 
 ?>
 
+<ul class="nav nav-tabs">
+   <li><a href="<?php echo $this->url('storage', array('action'=>'index')); ?>"><?php echo $this->translate('Devices'); ?></a></li>
+   <li class="active"><a href="<?php echo $this->url('pool', array('action'=>'index')); ?>"><?php echo $this->translate('Pools'); ?></a></li>
+   <li><a href="<?php echo $this->url('media', array('action'=>'index')); ?>"><?php echo $this->translate('Volumes'); ?></a></li>
+</ul>
+
+<br />
+
 <div class="row">
 
 <div class="col-md-12">
diff --git a/module/Storage/view/storage/storage/details.phtml b/module/Storage/view/storage/storage/details.phtml
index b5566786..584ef93c 100644
--- a/module/Storage/view/storage/storage/details.phtml
+++ b/module/Storage/view/storage/storage/details.phtml
@@ -29,8 +29,6 @@ $this->headTitle($title);
 
 ?>
 
-<div class="spinner" id="spinner"></div>
-
 <!-- modal-001 start -->
 <div id="modal-001" class="modal fade modal-001" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel">
   <div class="modal-dialog modal-md">
@@ -52,86 +50,76 @@ $this->headTitle($title);
 </div>
 <!-- modal-001 end -->
 
-<!-- IMPORT/EXPORT SLOTS -->
-   <div class="col-xs-6 col-md-4">
-
-      <div class="panel panel-default">
-         <div class="panel-heading">
-            <h3 class="panel-title">Import/Export Slots - <?php echo $this->storagename; ?></h3>
-         </div>
-         <div class="panel-body" style="overflow-y: auto;">
-            <table class="table table-hover" id="storage-ie-slots">
-               <thead class="bg-primary">
-                  <th>Slot</th>
-                  <th>Content</th>
-                  <th>Volume</th>
-                  <th>Bytes</th>
-                  <th>Last written</th>
-                  <th>Expiration</th>
-                  <th>Status</th>
-                  <th>Media Type</th>
-                  <th>Pool</th>
-                  <th></th>
-                  <th>Actions</th>
-               </thead>
-               <tbody class="table table-bordered">
-               </tbody>
-            </table>
-         </div>
-      </div>
+<div class="col-xs-6 col-md-4">
 
-      <div class="panel panel-default">
-         <div class="panel-heading">
-            <h3 class="panel-title">Drives - <?php echo $this->storagename; ?></h3>
-         </div>
-         <div class="panel-body" style="overflow-y: auto;">
-            <table class="table table-hover" id="storage-drives">
-               <thead class="bg-primary">
-                  <th>Drive</th>
-                  <th>Content</th>
-                  <th>Loaded</th>
-                  <th>Volume</th>
-                  <th></th>
-                  <th>Actions</th>
-               </thead>
-               <tbody class="table table-bordered">
-               </tbody>
-            </table>
-         </div>
+   <div class="panel panel-default">
+      <div class="panel-heading">
+         <h3 class="panel-title">Import/Export Slots - <?php echo $this->storagename; ?></h3>
+      </div>
+      <div class="panel-body" style="overflow-y: auto;">
+         <table class="table table-hover" id="storage-ie-slots">
+            <thead class="bg-primary">
+               <th>Slot</th>
+               <th>Volume</th>
+               <th></th>
+               <th>Actions</th>
+            </thead>
+            <tbody class="table table-bordered">
+            </tbody>
+         </table>
       </div>
-
    </div>
 
-   <div class="col-xs-12 col-md-8">
-
-      <div class="panel panel-default">
-         <div class="panel-heading">
-            <h3 class="panel-title">Slots - <?php echo $this->storagename; ?></h3>
-         </div>
-         <div class="panel-body" style="overflow-y: auto;">
-            <table class="table table-hover" id="storage-slots">
-               <thead class="bg-primary">
-                  <th>Slot</th>
-                  <th>Content</th>
-                  <th>Volume</th>
-                  <th>Bytes</th>
-                  <th>Last written</th>
-                  <th>Expiration</th>
-                  <th>Status</th>
-                  <th>Media Type</th>
-                  <th>Pool</th>
-                  <th></th>
-                  <th></th>
-                  <th>Actions</th>
-               </thead>
-               <tbody class="table table-bordered">
-               </tbody>
-            </table>
-         </div>
+   <div class="panel panel-default">
+      <div class="panel-heading">
+         <h3 class="panel-title">Drives - <?php echo $this->storagename; ?></h3>
+      </div>
+      <div class="panel-body" style="overflow-y: auto;">
+         <table class="table table-hover" id="storage-drives">
+            <thead class="bg-primary">
+               <th>Drive</th>
+               <th>Loaded</th>
+               <th>Volume</th>
+               <th></th>
+               <th>Actions</th>
+            </thead>
+            <tbody class="table table-bordered">
+            </tbody>
+         </table>
       </div>
+   </div>
+
+</div>
+
+<div class="col-xs-12 col-md-8">
 
+   <div class="panel panel-default">
+      <div class="panel-heading">
+         <h3 class="panel-title">Slots - <?php echo $this->storagename; ?></h3>
+      </div>
+      <div class="panel-body" style="overflow-y: auto;">
+         <table class="table table-hover" id="storage-slots">
+            <thead class="bg-primary">
+               <th>Slot</th>
+               <th>Volume</th>
+               <th>Bytes</th>
+               <th>Last written</th>
+               <th>Expiration</th>
+               <th>Status</th>
+               <th>Media Type</th>
+               <th>Pool</th>
+               <th></th>
+               <th></th>
+               <th>Actions</th>
+            </thead>
+            <tbody class="table table-bordered">
+            </tbody>
+         </table>
+      </div>
    </div>
 
+</div>
+
 <?php
    echo $this->headScript()->prependFile($this->basePath() . '/js/jquery.dataTables.min.js');
    echo $this->headScript()->prependFile($this->basePath() . '/js/dataTables.plugins.js');
@@ -155,15 +143,15 @@ $this->headTitle($title);
 $.fn.DataTable.ext.search.push(
    function( settings, aData, iDataIndex ) {
       if(settings.nTable.id === 'storage-slots') {
-         return (aData[10] === 'slot') ? true : false;
+         return (aData[9] === 'slot') ? true : false;
       }
 
       if(settings.nTable.id === 'storage-drives') {
-         return (aData[4] === 'drive') ? true : false;
+         return (aData[3] === 'drive') ? true : false;
       }
 
       if(settings.nTable.id === 'storage-ie-slots') {
-         return (aData[9] === 'import_slot') ? true : false;
+         return (aData[2] === 'import_slot') ? true : false;
       }
 
       return false;
@@ -192,48 +180,38 @@ $(document).ready(function() {
       "order": [[0, "asc"]],
       "searching": true,
       "info": false,
-      /*"select": {
-         "style": "os",
-         "blurable": true
-      },*/
       "columns": [
          { "data": "slotnr", "defaultContent": "" },
-         { "data": "content", "defaultContent": "", "orderable": false },
-         { "data": "mr_volname", "defaultContent": "" },
+         { "data": null, "defaultContent": "" },
          { "type": "file-size", "data": "mr_volbytes", "defaultContent": "" },
          { "data": "mr_lastwritten", "defaultContent": "0" },
          { "data": null, "defaultContent": "" },
          { "data": "mr_volstatus", "defaultContent": "" },
          { "data": "mr_mediatype", "defaultContent": "" },
          { "data": "pr_name", "defaultContent": "" },
-         { "type": "file-size", "data": "mr_volbytes", "defaultContent": "0" },
-         { "data": "type", "defaultContent": "unknown" },
+         { "data": "mr_volbytes", "defaultContent": "0.00 B", "visible": false },
+         { "data": "type", "defaultContent": "unknown", "visible": false },
          { "data": null, "defaultContent": "", "orderable": false }
       ],
       "columnDefs": [
          {
             "targets": 1,
-            "visible": false,
-            "render": function(data, type, full, meta) {
-               if(data == 'empty') {
-                  return '';
-               }
-               else {
-                  return '<span class="glyphicon glyphicon-barcode" aria-hidden="true"></span>';
-               }
-            }
-         },
-         {
-            "targets": 2,
             "render": function(data, type, full, meta) {
                if(data != null) {
-                  return '<a href="<?php echo $this->basePath() . '/media/details/'; ?>'+data+'">'+data+'</a>';
+                  if(data.mr_volstatus != null) {
+                     if(data.mr_volstatus != '?') {
+                        return '<a href="<?php echo $this->basePath() . '/media/details/'; ?>'+ data.mr_volname +'">'+ data.mr_volname +'</a>';
+                     }
+                     else {
+                        return data.mr_volname;
+                     }
+                  }
                }
             }
          },
          {
-            "targets": 3,
-            "orderData": 9,
+            "targets": 2,
+            "orderData": 8,
             "render": function(data, type, full, meta) {
                if(data == '?') {
                   return '';
@@ -244,7 +222,7 @@ $(document).ready(function() {
             }
          },
          {
-            "targets": 4,
+            "targets": 3,
             "render": function(data, type, full, meta) {
                if(data == "" || data == 0 || data == null) {
                   return '';
@@ -256,7 +234,7 @@ $(document).ready(function() {
             }
          },
          {
-            "targets": 5,
+            "targets": 4,
             "render": function(data, type, full, meta) {
                if(data.mr_volstatus != "Append") {
                   if(data.mr_expire > data.mr_lastwritten && data.mr_lastwritten > 0) {
@@ -269,7 +247,7 @@ $(document).ready(function() {
             }
          },
          {
-            "targets": 6,
+            "targets": 5,
             "render": function(data, type, full, meta) {
                if(data == '?') {
                   return '<span class="label label-warning">not in catalog</span>';
@@ -280,7 +258,7 @@ $(document).ready(function() {
             }
          },
          {
-            "targets": 7,
+            "targets": 6,
             "render": function(data, type, full, meta) {
                if(data == '?') {
                   return '';
@@ -291,7 +269,7 @@ $(document).ready(function() {
             }
          },
          {
-            "targets": 8,
+            "targets": 7,
             "render": function(data, type, full, meta) {
                if(data == '?') {
                   return '';
@@ -301,17 +279,8 @@ $(document).ready(function() {
                }
             }
          },
-         {
-            "targets": 9,
-            "visible": false,
-            "searchable": false
-         },
          {
             "targets": 10,
-            "visible": false
-         },
-         {
-            "targets": 11,
             "render": function(data, type, full, meta) {
                if(data.content == "empty") {
                   return '';
@@ -326,14 +295,12 @@ $(document).ready(function() {
          {
             "text": '<span class="glyphicon glyphicon-refresh" aria-hidden="true"></span>' + ' Update slots',
             "action": function(e, dt, node, conf) {
-               //$('#spinner').fadeIn('normal');
                window.location.assign('<?php echo $this->basePath() . "/storage/details/" . $this->storagename . "?action=updateslots&storage=" . $this->storagename; ?>');
             }
          },
          {
             "text": '<span class="glyphicon glyphicon-barcode" aria-hidden="true"></span>' + ' Label barcodes',
             "action": function(e, dt, node, conf) {
-               //$('#spinner').fadeIn('normal');
                window.location.assign('<?php echo $this->basePath() . "/storage/details/" . $this->storagename. "?action=label&storage=" . $this->storagename; ?>');
             }
          }
@@ -352,33 +319,16 @@ $(document).ready(function() {
       "order": [[0, "asc"]],
       "info": false,
       "searching": true,
-      /*"select": {
-         "style": "os",
-         "blurable": true
-      },*/
       "columns": [
          { "data": "slotnr", "defaultContent": "" },
-         { "data": "content", "defaultContent": "" },
          { "data": "loaded", "defaultContent": "" },
          { "data": "volname", "defaultContent": "" },
-         { "data": "type", "defaultContent": "unknown" },
+         { "data": "type", "defaultContent": "unknown", "visible": false },
          { "data": null, "defaultContent": "" }
       ],
       "columnDefs": [
          {
-            "targets": 1,
-            "visible": false,
-            "render": function(data, type, full, meta) {
-               if(data == 'empty') {
-                  return '';
-               }
-               else {
-                  return '<span class="glyphicon glyphicon-barcode" aria-hidden="true"></span>';
-               }
-            }
-         },
-         {
-            "targets": 3,
+            "targets": 2,
             "render": function(data, type, full, meta) {
                if(data != null) {
                   return '<a href="<?php echo $this->basePath() . '/media/details/'; ?>'+data+'">'+data+'</a>';
@@ -387,10 +337,6 @@ $(document).ready(function() {
          },
          {
             "targets": 4,
-            "visible": false
-         },
-         {
-            "targets": 5,
             "render": function(data, type, full, meta) {
                if(data.content == "empty") {
                   return '';
@@ -417,121 +363,30 @@ $(document).ready(function() {
       "order": [[0, "asc"]],
       "info": false,
       "searching": true,
-      /*"select": {
-         "style": "os",
-         "blurable": true
-      },*/
       "columns": [
          { "data": "slotnr", "defaultContent": "" },
-         { "data": "content", "defaultContent": "" },
-         { "data": "mr_volname", "defaultContent": "" },
-         { "type": "file-size", "data": "mr_volbytes", "defaultContent": "" },
-         { "data": "mr_lastwritten", "defaultContent": "" },
          { "data": null, "defaultContent": "" },
-         { "data": "mr_volstatus", "defaultContent": "" },
-         { "data": "mr_mediatype", "defaultContent": "" },
-         { "data": "pr_name", "defaultContent": "" },
-         { "data": "type", "defaultContent": "unknown" },
+         { "data": "type", "defaultContent": "", "visible": false },
          { "data": null, "defaultContent": "" }
       ],
       "columnDefs": [
          {
             "targets": 1,
-            "visible": false,
-            "render": function(data, type, full, meta) {
-               if(data != null && data != "empty") {
-                  return '<span class="glyphicon glyphicon-barcode" aria-hidden="true"></span>';
-               }
-            }
-         },
-         {
-            "targets": 2,
             "render": function(data, type, full, meta) {
                if(data != null) {
-                  return '<a href="<?php echo $this->basePath() . '/media/details/'; ?>'+data+'">'+data+'</a>';
+                  if(data.mr_volstatus != null) {
+                     if(data.mr_volstatus != '?') {
+                        return '<a href="<?php echo $this->basePath() . '/media/details/'; ?>'+ data.mr_volname +'">'+ data.mr_volname +'</a>';
+                     }
+                     else {
+                        return data.mr_volname;
+                     }
+                  }
                }
             }
          },
          {
             "targets": 3,
-            "visible": false,
-            "render": function(data, type, full, meta) {
-               if(data == '?') {
-                  return '';
-               }
-               else if(data != null) {
-                  return formatBytes(data);
-               }
-            }
-         },
-         {
-            "targets": 4,
-            "visible": false,
-            "render": function(data, type, full, meta) {
-               if(data == "" || data == 0 || data == null) {
-                  return '';
-               }
-               else {
-                  var f = moment.unix(data).format("YYYY-MM-DD HH:mm:ss");
-                  return f;
-               }
-            }
-         },
-         {
-            "targets": 5,
-            "visible": false,
-            "render": function(data, type, full, meta) {
-               if(data.mr_expire > data.mr_lastwritten && data.mr_lastwritten > 0) {
-                  var i = moment.unix(data.mr_expire).format("YYYY-MM-DD HH:mm:ss");
-                  return i;
-               }
-               else {
-                  return '';
-               }
-            }
-         },
-         {
-            "targets": 6,
-            "visible": false,
-            "render": function(data, type, full, meta) {
-               if(data == '?') {
-                  return '<span class="label label-warning">not in catalog</span>';
-               }
-               else {
-                  return data;
-               }
-            }
-         },
-         {
-            "targets": 7,
-            "visible": false,
-            "render": function(data, type, full, meta) {
-               if(data == '?') {
-                  return '';
-               }
-               else {
-                  return data;
-               }
-            }
-         },
-         {
-            "targets": 8,
-            "visible": false,
-            "render": function(data, type, full, meta) {
-               if(data == '?') {
-                  return '';
-               }
-               else if(data != null) {
-                  return '<a href="<?php echo $this->basePath() . '/pool/details/'; ?>'+data+'">'+data+'</a>';
-               }
-            }
-         },
-         {
-            "targets": 9,
-            "visible": false
-         },
-         {
-            "targets": 10,
             "render": function(data, type, full, meta) {
                if(data.content == "empty") {
                   return '';
@@ -565,18 +420,16 @@ $(document).ready(function() {
       $('[data-toggle="tooltip"]').tooltip();
    });
 
-   $('#spinner').fadeOut('normal');
-
    $('#storage-ie-slots tbody').on('click', '#btn-1', function() {
-      $('#spinner').fadeIn('normal');
+      $('#spinner').fadeTo('normal', 0.50);
    });
 
    $('#storage-drives tbody').on('click', '#btn-1', function() {
-      $('#spinner').fadeIn('normal');
+      $('#spinner').fadeTo('normal', 0.50);
    });
 
    $('#storage-slots tbody').on('click', '#btn-1', function() {
-      $('#spinner').fadeIn('normal');
+      $('#spinner').fadeTo('normal', 0.50);
    });
 
 });
diff --git a/module/Storage/view/storage/storage/index.phtml b/module/Storage/view/storage/storage/index.phtml
index 21a131d6..29a1feb5 100644
--- a/module/Storage/view/storage/storage/index.phtml
+++ b/module/Storage/view/storage/storage/index.phtml
@@ -29,9 +29,17 @@ $this->headTitle($title);
 
 ?>
 
+<ul class="nav nav-tabs">
+   <li class="active"><a href="<?php echo $this->url('storage', array('action'=>'index')); ?>"><?php echo $this->translate('Devices'); ?></a></li>
+   <li><a href="<?php echo $this->url('pool', array('action'=>'index')); ?>"><?php echo $this->translate('Pools'); ?></a></li>
+   <li><a href="<?php echo $this->url('media', array('action'=>'index')); ?>"><?php echo $this->translate('Volumes'); ?></a></li>
+</ul>
+
+<br />
+
 <div class="row">
 
-<div class="col-md-12">
+<div class="col-md-6">
 <div class="panel panel-default">
 
 <div class="panel-heading">
diff --git a/public/css/style.css b/public/css/style.css
index 8bb3efc8..09d7eeda 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -82,4 +82,5 @@ body {
    height: 100%;
    z-index: 10000;
    background: url(spinner.gif) center no-repeat #fff;
+   opacity: 0.5;
 }
