diff --git a/main/views.py b/main/views.py
index 2110eb2..e8cb0f2 100755
--- a/main/views.py
+++ b/main/views.py
@@ -152,9 +152,11 @@ def get_disk():
     """
     try:
 	pipe = os.popen("df -Ph | " + "grep -v Filesystem | " + "awk '{print $1, $2, $3, $4, $5, $6}'")
-	data = pipe.read().strip().split()
+	data = pipe.read().strip().split('\n')
 	pipe.close()
 	
+	data = [i.split(None, 6) for i in data]
+
     except Exception,err: 
 	data =  str(err)
     
@@ -226,7 +228,7 @@ def getall(request):
 					    'gethostname': get_hostname(),
 					    'getplatform': get_platform(),
 					    'getcpus': get_cpus(),
-					    'getdisk': get_disk(),
+					    #'getdisk': get_disk(),
 					    'getip': get_ipaddress(),
 					    'gettraffic': get_traffic('eth0'),
 					    'getusers': get_users(),
diff --git a/pydash/urls.py b/pydash/urls.py
index 7baa2f2..0891220 100644
--- a/pydash/urls.py
+++ b/pydash/urls.py
@@ -18,6 +18,7 @@ urlpatterns = patterns('',
     url(r'^info/memory/$', 'usage.views.memusage', name='memusage'),
     url(r'^info/users/$', 'usage.views.getusers', name='getusers'),
     url(r'^info/cpuusage/$', 'usage.views.cpuusage', name='cpuusage'),
+    url(r'^info/getdisk/$', 'usage.views.getdisk', name='getdisk'),
     url(r'^info/loadaverage/$', 'usage.views.loadaverage', name='loadaverage')
 )
 
diff --git a/templates/disk.html b/templates/disk.html
index 4f55b68..0db5816 100644
--- a/templates/disk.html
+++ b/templates/disk.html
@@ -1,4 +1,4 @@
-<table class="table table-hover table-condensed table-bordered">
+<table class="table table-hover table-condensed table-bordered" >
     <thead>
 	<tr>
 	    <th>Filesystem</th>
@@ -9,11 +9,6 @@
             <th>Mounted</th>
         </tr>
     </thead>
-    <tbody>
-    {% for data in getdisk %}
-	{% cycle '<tr>' '' '' '' '' ''%}
-        <td>{{data}}</td>
-        {% cycle '' '' '' '' '' '</tr>' %}
-    {% endfor %}
+    <tbody id="get-disk">
     </tbody>
 </table>
diff --git a/templates/main.html b/templates/main.html
index 5480950..209a657 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -260,9 +260,16 @@ var dashboard = {};
 dashboard.getOs = function() {
 	get_os_data('/info/uptime/', "#os-uptime");
 	}
-dashboard.getUser = function() {
-	get_os_data('/info/users/', "#os-users");
-	}
+dashboard.getDisk = function() {
+	$.getJSON('/info/getdisk/{{ getdisk }}', function(data) {
+	    var tr='';
+	    $.each( data, function( index, item){
+		tr+='<tr><td>'+item[0]+'</td><td>'+item[1]+'</td><td>'+item[2]+'</td><td>'+item[3]+'</td><td>'+item[4]+'</td><td>'+item[5]+'</td></tr>';
+		})
+	    tr+='';
+	    $("#get-disk").html( tr );
+	});
+    }
 	
 var mem_ctx = $("#memoryChart").get(0).getContext("2d");
         var memChart = new Chart(mem_ctx);
@@ -307,6 +314,7 @@ var load_ctx = $("#loadChart").get(0).getContext("2d");
             window.setInterval('memory_usage()', {{ time_refresh }});
             window.setInterval('load_average()', {{ time_refresh }});
             window.setInterval('dashboard.getOs()', {{ time_refresh }});
+            window.setInterval('dashboard.getDisk()', {{ time_refresh }});
             window.setInterval('cpuu_usage()', {{ time_refresh }});
         });
         
diff --git a/usage/views.py b/usage/views.py
index a52d39a..8dac725 100755
--- a/usage/views.py
+++ b/usage/views.py
@@ -25,6 +25,25 @@ def uptime(request):
     response['Content-Type'] = "text/javascript"
     response.write(data)
     return response
+
+def getdisk(request):
+    """
+    Return the disk usage
+    """
+    if not request.user.is_authenticated():
+        return HttpResponseRedirect('/login')
+    
+    try:
+	getdisk = get_disk()
+    except Exception:
+	getdisk = None
+	
+    data = simplejson.dumps(getdisk)
+    response = HttpResponse()
+    response['Content-Type'] = "text/javascript"
+    response.write(data)
+    return response
+
     
 def getusers(request):
     """