diff --git a/index.html b/index.html
index 0ebde55..f1f5eeb 100755
--- a/index.html
+++ b/index.html
@@ -28,11 +28,10 @@
 			<h3>{{name}}</h3>
 		</div>
 		<div class="span6">
-			<span class="badge badge-success">Status: {{status}}</span>
 			<b style='display:inline; float:right;'>
-				Size: {{size}} |
-				Progress: {{percentage}}% |
-				down: {{down}}
+				<span class="label label-success">Size: {{size}}</span> |
+				<span class="label label-success">Progress: {{percentage}}%</span> |
+				<span class="label label-success">Speed: {{down}}</span>
 			</b>
 		</div>
 		<div class="span2">
@@ -55,8 +54,8 @@
 		<div class="span6">
 			<span class="badge badge-warning">Status: {{status}}</span>
 			<b style='display:inline; float:right;'>
-				Size: {{size}} |
-				Progress: {{percentage}}%
+				<span class="label label-warning">Size: {{size}}</span> |
+				<span class="label label-warning">Progress: {{percentage}}%</span>
 			</b>
 		</div>
 		<div class="span2">
@@ -79,8 +78,8 @@
 		<div class="span6">
 			<span class="badge badge-important">Status: {{status}}</span>
 			<b style='display:inline; float:right;'>
-				Size: {{size}} |
-				Progress: {{percentage}}%
+				<span class="label label-important">Size: {{size}}</span> |
+				<span class="label label-important">Progress: {{percentage}}%</span>
 			</b>
 		</div>
 		<div class="span2">
diff --git a/js/script.js b/js/script.js
index 47ce203..44d188c 100755
--- a/js/script.js
+++ b/js/script.js
@@ -99,6 +99,7 @@ function updateActiveDownloads(data) {
 	for(var i = 0; i < data.length; i++) {
 		var percentage =(data[i].completedLength / data[i].totalLength)*100;
 		percentage = Math.round(percentage*1000)/1000;
+		if(!percentage) percentage = 0;
 		ctx = {
 			name: data[i].files[0].uris[0].uri.replace(/^.*[\\\/]/, ''),
 			status: data[i].status,
@@ -148,6 +149,7 @@ function updateWaitingDownloads(data) {
 	for(var i = 0; i < data.length; i++) {
 		var percentage =(data[i].completedLength / data[i].totalLength)*100;
 		percentage = Math.round(percentage*1000)/1000;
+		if(!percentage) percentage = 0;
 		ctx = {
 			name: data[i].files[0].uris[0].uri.replace(/^.*[\\\/]/, ''),
 			status: data[i].status,
@@ -198,6 +200,7 @@ function updateStoppedDownloads(data) {
 	for(var i = 0; i < data.length; i++) {
 		var percentage =(data[i].completedLength / data[i].totalLength)*100;
 		percentage = Math.round(percentage*1000)/1000;
+		if(!percentage) percentage = 0;
 		ctx = {
 			name: data[i].files[0].uris[0].uri.replace(/^.*[\\\/]/, ''),
 			status: data[i].status,