diff --git a/glances/outputs/static/js/components/plugin-diskio/view.html b/glances/outputs/static/js/components/plugin-diskio/view.html
index 81e4480a..cec71f00 100644
--- a/glances/outputs/static/js/components/plugin-diskio/view.html
+++ b/glances/outputs/static/js/components/plugin-diskio/view.html
@@ -7,10 +7,10 @@
     <div class="table-cell" ng-show="vm.arguments.diskio_iops">IOW/s</div>
 </div>
 <div class="table-row" ng-repeat="disk in vm.disks">
-    <div class="table-cell text-left">{{(disk.alias ? disk.alias : disk.name) | min_size:9}}</div>
-    <div class="table-cell" ng-show="!vm.arguments.diskio_iops">{{disk.bitrate.txps }}</div>
-    <div class="table-cell" ng-show="!vm.arguments.diskio_iops">{{disk.bitrate.rxps }}</div>
+    <div class="table-cell text-left">{{ (disk.alias ? disk.alias : disk.name) | min_size:32 }}</div>
+    <div class="table-cell" ng-show="!vm.arguments.diskio_iops">{{ disk.bitrate.txps }}</div>
+    <div class="table-cell" ng-show="!vm.arguments.diskio_iops">{{ disk.bitrate.rxps }}</div>
 
-    <div class="table-cell" ng-show="vm.arguments.diskio_iops">{{disk.count.txps }}</div>
-    <div class="table-cell" ng-show="vm.arguments.diskio_iops">{{disk.count.rxps }}</div>
+    <div class="table-cell" ng-show="vm.arguments.diskio_iops">{{ disk.count.txps }}</div>
+    <div class="table-cell" ng-show="vm.arguments.diskio_iops">{{ disk.count.rxps }}</div>
 </div>
diff --git a/glances/outputs/static/js/components/plugin-fs/controller.js b/glances/outputs/static/js/components/plugin-fs/controller.js
index b4cfdbab..bdee3605 100644
--- a/glances/outputs/static/js/components/plugin-fs/controller.js
+++ b/glances/outputs/static/js/components/plugin-fs/controller.js
@@ -22,8 +22,8 @@ export default function GlancesPluginFsController($scope, $filter, GlancesStats,
             var fsData = stats[i];
 
             var shortMountPoint = fsData['mnt_point'];
-            if (shortMountPoint.length > 9) {
-                shortMountPoint = '_' + fsData['mnt_point'].slice(-8);
+            if (shortMountPoint.length > 22) {
+                shortMountPoint = '_' + fsData['mnt_point'].slice(-21);
             }
 
             vm.fileSystems.push({
diff --git a/glances/outputs/static/js/components/plugin-fs/view.html b/glances/outputs/static/js/components/plugin-fs/view.html
index 0ca9bd3f..52482556 100644
--- a/glances/outputs/static/js/components/plugin-fs/view.html
+++ b/glances/outputs/static/js/components/plugin-fs/view.html
@@ -7,8 +7,8 @@
     <div class="table-cell">Total</div>
 </div>
 <div class="table-row" ng-repeat="fs in vm.fileSystems">
-    <div class="table-cell text-left">{{ fs.shortMountPoint }} <span class="visible-lg-inline"
-            ng-show="fs.name.length <= 20">({{ fs.name }})</span>
+    <div class="table-cell text-left">{{ fs.shortMountPoint }}
+        <span class="visible-lg-inline" ng-show="fs.shortMountPoint <= 12">({{ fs.name }})</span>
     </div>
     <div class="table-cell" ng-class="vm.getDecoration(fs.mountPoint, 'used')">
         <span ng-show="!vm.arguments.fs_free_space">{{ fs.used | bytes }}</span>
diff --git a/glances/outputs/static/public/glances.js b/glances/outputs/static/public/glances.js
index 1e033336..094fb657 100644
Binary files a/glances/outputs/static/public/glances.js and b/glances/outputs/static/public/glances.js differ
diff --git a/glances/outputs/static/public/glances.map.js b/glances/outputs/static/public/glances.map.js
index f14559ab..d967382f 100644
Binary files a/glances/outputs/static/public/glances.map.js and b/glances/outputs/static/public/glances.map.js differ
diff --git a/glances/plugins/glances_diskio.py b/glances/plugins/glances_diskio.py
index 2134e974..fa042cfe 100644
--- a/glances/plugins/glances_diskio.py
+++ b/glances/plugins/glances_diskio.py
@@ -187,10 +187,7 @@ class Plugin(GlancesPlugin):
             if all([self.get_views(item=i[self.get_key()], key=f, option='hidden') for f in self.hide_zero_fields]):
                 continue
             # Is there an alias for the disk name ?
-            disk_real_name = i['disk_name']
-            disk_name = self.has_alias(i['disk_name'])
-            if disk_name is None:
-                disk_name = disk_real_name
+            disk_name = self.has_alias(i['disk_name']) if self.has_alias(i['disk_name']) else i['disk_name']
             # New line
             ret.append(self.curse_new_line())
             if len(disk_name) > name_max_width: