diff --git a/app/frontend/templates/panel/dashboard.html b/app/frontend/templates/panel/dashboard.html
index 8c81bda9..981a4163 100644
--- a/app/frontend/templates/panel/dashboard.html
+++ b/app/frontend/templates/panel/dashboard.html
@@ -59,12 +59,12 @@
                 </div>
                 <div class="wrapper my-auto ml-auto ml-lg-4">
                   <p id="cpu_data" class="mb-0 text-success" data-toggle="tooltip" data-placement="top" data-html="true"
-                     title="{% raw translate('dashboard', 'cpuCores', data['lang']) %}: {{ data.get('hosts_data').get('cpu_cores') }} <br /> {% raw translate('dashboard', 'cpuCurFreq', data['lang']) %}: {{ data.get('hosts_data').get('cpu_cur_freq') }} <br /> {% raw translate('dashboard', 'cpuMaxFreq', data['lang']) %}: {{ data.get('hosts_data').get('cpu_max_freq') }}">
+                    title="{% raw translate('dashboard', 'cpuCores', data['lang']) %}: {{ data.get('hosts_data').get('cpu_cores') }} <br /> {% raw translate('dashboard', 'cpuCurFreq', data['lang']) %}: {{ data.get('hosts_data').get('cpu_cur_freq') }} <br /> {% raw translate('dashboard', 'cpuMaxFreq', data['lang']) %}: {{ data.get('hosts_data').get('cpu_max_freq') }}">
                     {{ translate('dashboard', 'cpuUsage', data['lang']) }}: <span id="cpu_usage">{{
                       data.get('hosts_data').get('cpu_usage') }}</span>
                   </p>
                   <p id="mem_usage" class="mb-0 text-danger" data-toggle="tooltip" data-placement="top"
-                     title="{{ translate('dashboard', 'memUsage', data['lang']) }}: {{ data.get('hosts_data').get('mem_usage') }}">
+                    title="{{ translate('dashboard', 'memUsage', data['lang']) }}: {{ data.get('hosts_data').get('mem_usage') }}">
                     {{ translate('dashboard', 'memUsage', data['lang']) }}: <span id="mem_percent">{{
                       data.get('hosts_data').get('mem_percent') }}%</span>
                   </p>
@@ -110,18 +110,22 @@
                       {% for item in data.get('hosts_data').get('disk_json') %}
                       {% if item["mount"] in data["monitored"] %}
                       <div id="{{item['device']}}" class="col-xl-3 col-lg-3 col-md-4 col-12">
-                        <h4 class="mb-0 font-weight-semibold d-inline-block text-truncate" id="title_{{item['device']}}" data-toggle="tooltip" data-placement="bottom" title="{{item['mount']}}" style="max-width: 100%;"><i class="fas fa-hdd"></i> {{item["mount"]}}</h4>
-                        <div class="progress d-inline-block" style="height: 20px; width: 100%; background-color: rgb(139, 139, 139) !important;">
+                        <h4 class="mb-0 font-weight-semibold d-inline-block text-truncate storage-heading"
+                          id="title_{{item['device']}}" data-toggle="tooltip" data-placement="bottom"
+                          title="{{item['mount']}}" style="max-width: 100%;"><i class="fas fa-hdd"></i>
+                          {{item["mount"]}}</h4>
+                        <div class="progress d-inline-block"
+                          style="height: 20px; width: 100%; background-color: rgb(139, 139, 139) !important;">
                           <div class="progress-bar
-                        {% if item['percent_used'] <= 33 %}
+                        {% if item['percent_used'] <= 58 %}
                         bg-success
-                        {% elif 34 <= item['percent_used'] <= 75 %}
+                        {% elif 59 <= item['percent_used'] <= 75 %}
                         bg-warning
                         {% else %}
                         bg-danger
                         {% end %}
                         " role="progressbar" style="color: black; height: 100%; width: {{item['percent_used']}}%;"
-                               aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">{{item["used"]}} /
+                            aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">{{item["used"]}} /
                             {{item["total"]}}
                           </div>
                         </div>
@@ -148,8 +152,8 @@
           {% if len(data['servers']) > 0 %}
           {% if data['user_data']['hints'] %}
           <span class="too_small" title="{{ translate('dashboard', 'cannotSeeOnMobile', data['lang']) }}" ,
-                data-content="{{ translate('dashboard', 'cannotSeeOnMobile2', data['lang']) }}" ,
-                data-placement="top"></span>
+            data-content="{{ translate('dashboard', 'cannotSeeOnMobile2', data['lang']) }}" ,
+            data-placement="top"></span>
           {% end %}
           {% end %}
           <div><a class="nav-link" href="/server/step1"><i class="fas fa-plus-circle"></i> &nbsp; {{
@@ -188,7 +192,7 @@
                     <i class="fas fa-server"></i>
                     {% if server['alert'] %}
                     <a style="color: red !important;" draggable="false"
-                       href="/panel/server_detail?id={{server['server_data']['server_id']}}">
+                      href="/panel/server_detail?id={{server['server_data']['server_id']}}">
                       {{ server['server_data']['server_name'] }}&nbsp; <i class="fas fa-exclamation-triangle"></i>
                     </a>
                     {% else %}
@@ -203,12 +207,12 @@
                     {% if server['stats']['importing'] and server['stats']['running'] %}
                     <!-- WHAT HAPPENED HERE -->
                     <a data-id="{{server['server_data']['server_id']}}" class=""><i
-                         class="fa fa-spinner fa-spin"></i>&nbsp;{{ translate('serverTerm', 'installing',
+                        class="fa fa-spinner fa-spin"></i>&nbsp;{{ translate('serverTerm', 'installing',
                       data['lang']) }}</i></a>
                     {% elif server['stats']['updating']%}
                     <!-- WHAT HAPPENED HERE -->
                     <a data-id="{{server['server_data']['server_id']}}" class=""><i
-                         class="fa fa-spinner fa-spin"></i>&nbsp;{{ translate('serverTerm', 'updating',
+                        class="fa fa-spinner fa-spin"></i>&nbsp;{{ translate('serverTerm', 'updating',
                       data['lang']) }}</i></a>
                     {% elif server['stats']['waiting_start']%}
                     <!-- WHAT HAPPENED HERE -->
@@ -221,30 +225,30 @@
                       data['lang']) }}</a>
                     {% elif server['stats']['running'] %}
                     <a data-id="{{server['server_data']['server_id']}}" class="stop_button" data-toggle="tooltip"
-                       title="{{ translate('dashboard', 'stop' , data['lang']) }}">
+                      title="{{ translate('dashboard', 'stop' , data['lang']) }}">
                       <i class="fas fa-stop"></i>
                     </a> &nbsp;
 
                     <a data-id="{{server['server_data']['server_id']}}" class="restart_button" data-toggle="tooltip"
-                       title="{{ translate('dashboard', 'restart' , data['lang']) }}">
+                      title="{{ translate('dashboard', 'restart' , data['lang']) }}">
                       <i class="fas fa-sync"></i>
                     </a> &nbsp;
 
                     <a data-id="{{server['server_data']['server_id']}}" class="kill_button" data-toggle="tooltip"
-                       title="{{ translate('dashboard', 'kill' , data['lang']) }}">
+                      title="{{ translate('dashboard', 'kill' , data['lang']) }}">
                       <i class="fas fa-skull"></i>
                     </a> &nbsp;
                     {% else %}
                     <a data-id="{{server['server_data']['server_id']}}" class="play_button" data-toggle="tooltip"
-                       title="{{ translate('dashboard', 'start' , data['lang']) }}">
+                      title="{{ translate('dashboard', 'start' , data['lang']) }}">
                       <i class="fas fa-play"></i>
                     </a> &nbsp;
                     <a data-id="{{server['server_data']['server_id']}}" class="clone_button" data-toggle="tooltip"
-                       title="{{ translate('dashboard', 'clone' , data['lang']) }}">
+                      title="{{ translate('dashboard', 'clone' , data['lang']) }}">
                       <i class="fas fa-clone"></i>
                     </a> &nbsp;
                     <a data-id="{{server['server_data']['server_id']}}" class="kill_button" data-toggle="tooltip"
-                       title="{{ translate('dashboard', 'kill' , data['lang']) }}">
+                      title="{{ translate('dashboard', 'kill' , data['lang']) }}">
                       <i class="fas fa-skull"></i>
                     </a> &nbsp;
                     {% end %}
@@ -253,7 +257,7 @@
 
                   <td draggable="false" id="server_cpu_{{server['server_data']['server_id']}}">
                     <div class="progress mb-1" data-toggle="tooltip" data-placement="top"
-                         title="{{server['stats']['cpu']}}">
+                      title="{{server['stats']['cpu']}}">
                       <div class="progress-bar
                       {% if server['stats']['cpu'] <= 33 %}
                       bg-success
@@ -263,14 +267,14 @@
                       bg-danger
                       {% end %}
                       " role="progressbar" style="width: {{server['stats']['cpu']}}%" aria-valuenow="0"
-                           aria-valuemin="0" aria-valuemax="100"></div>
+                        aria-valuemin="0" aria-valuemax="100"></div>
                     </div>
                     {{server['stats']['cpu']}}%
                   </td>
 
                   <td draggable="false" id="server_mem_{{server['server_data']['server_id']}}">
                     <div class="progress mb-1" data-toggle="tooltip" data-placement="top"
-                         title="{{server['stats']['mem']}}">
+                      title="{{server['stats']['mem']}}">
                       <div class="progress-bar
                       {% if server['stats']['mem_percent'] <= 33 %}
                       bg-success
@@ -280,7 +284,7 @@
                       bg-danger
                       {% end %}
                       " role="progressbar" style="width: {{server['stats']['mem_percent']}}%" aria-valuenow="0"
-                           aria-valuemin="0" aria-valuemax="100"></div>
+                        aria-valuemin="0" aria-valuemax="100"></div>
                     </div>
                     {{server['stats']['mem_percent']}}% -
 
@@ -300,7 +304,7 @@
 
                     {% if server['stats']['desc'] != 'False' %}
                     <div id="desc_id"
-                         style="overflow-wrap: break-word !important; max-width: 85px !important; overflow: scroll;">{{
+                      style="overflow-wrap: break-word !important; max-width: 85px !important; overflow: scroll;">{{
                       server['stats']['desc'] }}</div> <br />
                     {% end %}
 
@@ -329,7 +333,7 @@
                         <br />
                   </td>
                   <span class="server-player-totals" id="server_players_{{server['server_data']['server_id']}}"
-                        data-players="{{ server['stats']['online']}}" data-max="{{ server['stats']['max'] }}"></span>
+                    data-players="{{ server['stats']['online']}}" data-max="{{ server['stats']['max'] }}"></span>
                 </tr>
                 {% end %}
           </div>
@@ -337,7 +341,7 @@
           {% for server in data['failed_servers'] %}
           <tr id="{{server['server_id']}}" draggable="false">
             <td class="text-warning"><i class="fas fa-server"></i>&nbsp;<a class="text-warning"
-                 href="/panel/server_detail?id={{server['server_id']}}&subpage=config">{{server['server_name']}}</a>
+                href="/panel/server_detail?id={{server['server_id']}}&subpage=config">{{server['server_name']}}</a>
             </td>
             <td></td>
             <td></td>
@@ -363,27 +367,27 @@
                     <div class="col-10 col-lg-3 mx-0 px-0">
                       {% if server['alert'] %}
                       <a style="color: red !important" class="btn btn-link d-flex justify-content-start" type="button"
-                         href="/panel/server_detail?id={{server['server_data']['server_id']}}">
+                        href="/panel/server_detail?id={{server['server_data']['server_id']}}">
                         <i class="fas fa-server"></i> {{ server['server_data']['server_name'] }}&nbsp; <i
-                           class="fas fa-exclamation-triangle"></i>
+                          class="fas fa-exclamation-triangle"></i>
                       </a>
                       {% else %}
                       <a class="btn btn-link d-flex justify-content-start" type="button"
-                         href="/panel/server_detail?id={{server['server_data']['server_id']}}">
+                        href="/panel/server_detail?id={{server['server_data']['server_id']}}">
                         <i class="fas fa-server"></i> {{ server['server_data']['server_name'] }}
                       </a>
                       {% end %}
                     </div>
                     <div class="col-2 col-lg-3 mx-0 px-0">
                       <a class="btn btn-link d-flex justify-content-center" type="button" data-toggle="collapse"
-                         data-target="#collapse-{{server['server_data']['server_id']}}" aria-expanded="false"
-                         aria-controls="collapse-{{server['server_data']['server_id']}}">
+                        data-target="#collapse-{{server['server_data']['server_id']}}" aria-expanded="false"
+                        aria-controls="collapse-{{server['server_data']['server_id']}}">
                         <i class="fas fa-chart-bar"></i>
                       </a>
                     </div>
                     <div class="col-4 col-lg-3 mx-0 px-0">
                       <a id="m_server_running_status_{{server['server_data']['server_id']}}"
-                         class="btn btn-link d-flex justify-content-start" type="button">
+                        class="btn btn-link d-flex justify-content-start" type="button">
                         {% if server['stats']['running'] %}
                         <span class="text-success"><i class="fas fa-signal"></i> {{ translate('dashboard', 'online',
                           data['lang']) }}</span>
@@ -405,22 +409,22 @@
                         <div class="row">
                           <div class="col-4 px-0">
                             <a data-id="{{server['server_data']['server_id']}}"
-                               class="btn btn-link stop_button actions_serveritem" data-toggle="tooltip"
-                               title="{{ translate('dashboard', 'stop' , data['lang']) }}">
+                              class="btn btn-link stop_button actions_serveritem" data-toggle="tooltip"
+                              title="{{ translate('dashboard', 'stop' , data['lang']) }}">
                               <i class="fas fa-stop"></i>
                             </a>
                           </div>
                           <div class="col-4 px-0">
                             <a data-id="{{server['server_data']['server_id']}}"
-                               class="btn btn-link restart_button actions_serveritem" data-toggle="tooltip"
-                               title="{{ translate('dashboard', 'restart' , data['lang']) }}">
+                              class="btn btn-link restart_button actions_serveritem" data-toggle="tooltip"
+                              title="{{ translate('dashboard', 'restart' , data['lang']) }}">
                               <i class="fas fa-sync"></i>
                             </a>
                           </div>
                           <div class="col-4 px-0">
                             <a data-id="{{server['server_data']['server_id']}}"
-                               class="btn btn-link kill_button actions_serveritem" data-toggle="tooltip"
-                               title="{{ translate('dashboard', 'kill' , data['lang']) }}">
+                              class="btn btn-link kill_button actions_serveritem" data-toggle="tooltip"
+                              title="{{ translate('dashboard', 'kill' , data['lang']) }}">
                               <i class="fas fa-skull"></i>
                             </a>
                           </div>
@@ -447,7 +451,7 @@
                         <div class="row">
                           <div class="col-12 px-0">
                             <a data-id="{{server['server_data']['server_id']}}" class="btn btn-link"><i
-                                 class="fa fa-spinner fa-spin"></i>
+                                class="fa fa-spinner fa-spin"></i>
                               {{ translate('serverTerm', 'importing', data['lang']) }}</a>
                           </div>
                         </div>
@@ -455,22 +459,22 @@
                         <div class="row">
                           <div class="col-4 px-0">
                             <a data-id="{{server['server_data']['server_id']}}"
-                               class="btn play_button actions_serveritem" data-toggle="tooltip"
-                               title="{{ translate('dashboard', 'start' , data['lang']) }}">
+                              class="btn play_button actions_serveritem" data-toggle="tooltip"
+                              title="{{ translate('dashboard', 'start' , data['lang']) }}">
                               <i class="fas fa-play"></i>
                             </a>
                           </div>
                           <div class="col-4 px-0">
                             <a data-id="{{server['server_data']['server_id']}}"
-                               class="btn clone_button actions_serveritem" data-toggle="tooltip"
-                               title="{{ translate('dashboard', 'clone' , data['lang']) }}">
+                              class="btn clone_button actions_serveritem" data-toggle="tooltip"
+                              title="{{ translate('dashboard', 'clone' , data['lang']) }}">
                               <i class="fas fa-clone"></i>
                             </a>
                           </div>
                           <div class="col-4 px-0">
                             <a data-id="{{server['server_data']['server_id']}}"
-                               class="btn kill_button actions_serveritem" data-toggle="tooltip"
-                               title="{{ translate('dashboard', 'kill' , data['lang']) }}">
+                              class="btn kill_button actions_serveritem" data-toggle="tooltip"
+                              title="{{ translate('dashboard', 'kill' , data['lang']) }}">
                               <i class="fas fa-skull"></i></a>
                           </div>
                         </div>
@@ -483,14 +487,14 @@
               </div>
 
               <div id="collapse-{{server['server_data']['server_id']}}" class="collapse"
-                   aria-labelledby="heading-{{server['server_data']['server_id']}}" data-parent="#accordionServers">
+                aria-labelledby="heading-{{server['server_data']['server_id']}}" data-parent="#accordionServers">
                 <div class="card-body">
                   <div class="row">
                     <div class="col-6">
                       <h6>{{ translate('dashboard', 'cpuUsage', data['lang']) }}</h6>
                       <div id="m_server_cpu_{{server['server_data']['server_id']}}">
                         <div class="progress mb-1" data-toggle="tooltip" data-placement="top"
-                             title="{{server['stats']['cpu']}}">
+                          title="{{server['stats']['cpu']}}">
                           <div class="progress-bar
                     {% if server['stats']['cpu'] <= 33 %}
                     bg-success
@@ -500,7 +504,7 @@
                     bg-danger
                     {% end %}
                     " role="progressbar" style="width: {{server['stats']['cpu']}}%" aria-valuenow="0" aria-valuemin="0"
-                               aria-valuemax="100"></div>
+                            aria-valuemax="100"></div>
                         </div>
                         {{server['stats']['cpu']}}%
                       </div>
@@ -509,7 +513,7 @@
                       <h6>{{ translate('dashboard', 'memUsage', data['lang']) }}</h6>
                       <div draggable="false" id="m_server_mem_{{server['server_data']['server_id']}}">
                         <div class="progress mb-1" data-toggle="tooltip" data-placement="top"
-                             title="{{server['stats']['mem']}}">
+                          title="{{server['stats']['mem']}}">
                           <div class="progress-bar
                     {% if server['stats']['mem_percent'] <= 33 %}
                     bg-success
@@ -519,7 +523,7 @@
                     bg-danger
                     {% end %}
                     " role="progressbar" style="width: {{server['stats']['mem_percent']}}%" aria-valuenow="0"
-                               aria-valuemin="0" aria-valuemax="100"></div>
+                            aria-valuemin="0" aria-valuemax="100"></div>
                         </div>
                         {{server['stats']['mem_percent']}}% -
 
@@ -549,7 +553,7 @@
 
                         {% if server['stats']['desc'] != 'False' %}
                         <div id="desc_id"
-                             style="overflow-wrap: break-word !important; max-width: 85px !important; overflow: scroll;">
+                          style="overflow-wrap: break-word !important; max-width: 85px !important; overflow: scroll;">
                           {{ server['stats']['desc'] }}</div> <br />
                         {% end %}
 
@@ -928,12 +932,12 @@
         for (i = 0; i < hostStats.disk_usage.length; i++) {
           if (hostStats.mounts.includes(hostStats.disk_usage[i].mount)) {
             storage_html += `<div id="{{item['device']}}" class="col-xl-3 col-lg-3 col-md-4 col-12">
-                        <h4 class="mb-0 font-weight-semibold d-inline-block text-truncate" id="title_{{item['device']}}" data-toggle="tooltip" data-placement="bottom" title="${hostStats.disk_usage[i].mount}" style="max-width: 100%;"><i class="fas fa-hdd"></i> ${hostStats.disk_usage[i].mount}</h4>
+                        <h4 class="mb-0 font-weight-semibold d-inline-block text-truncate storage-heading" id="title_{{item['device']}}" data-toggle="tooltip" data-placement="bottom" title="${hostStats.disk_usage[i].mount}" style="max-width: 100%;"><i class="fas fa-hdd"></i> ${hostStats.disk_usage[i].mount}</h4>
                         <div class="progress" style="display: inline-block; height: 20px; width: 100%; background-color: rgb(139, 139, 139) !important;">
                           <div class="progress-bar`;
-            if (hostStats.disk_usage[i].percent_used <= 33) {
+            if (hostStats.disk_usage[i].percent_used <= 58) {
               storage_html += ` bg-success`;
-            } else if (hostStats.disk_usage[i].percent_used <= 75 && hostStats.disk_usage[i].percent_used >= 34) {
+            } else if (hostStats.disk_usage[i].percent_used <= 75 && hostStats.disk_usage[i].percent_used >= 59) {
               storage_html += ` bg-warning`;
             } else {
               storage_html += ` bg-danger`;
@@ -946,7 +950,9 @@
           }
         }
         storage_html += `</div>`;
+        $(".storage-heading").tooltip('hide');
         $("#storage_data").html(storage_html);
+        $("#storage_data").tooltip({ selector: '.storage-heading' });
       });
     }