diff --git a/winixd/html/fun_uptime.html b/winixd/html/fun_uptime.html
index e3035f8..8a50e4c 100644
--- a/winixd/html/fun_uptime.html
+++ b/winixd/html/fun_uptime.html
@@ -2,20 +2,40 @@
 
 <h1>{uptime_header}</h1>
 
-<p>{uptime_current_time}: [winix_cur_time]<br>
-{uptime_up}:
+<table class="uk-table uk-table-divider uk-table-small uk-table-justify uk-width-2-3@s uk-width-1-2@m">
 
+<tr>
+<th>{uptime_current_time}</th><td>[winix_cur_time]</td>
+</tr>
+
+<tr>
+<th>{uptime_up}</th>
+<td>
 [if uptime_more_than_one_day]
 	[uptime_days] {uptime_days}
 [else]
 	[uptime_hours]
 [end]
-<br>
-{uptime_how_many_sessions}: [winix_how_many_sessions]<br>
-{uptime_users_logged}: [winix_users_logged]<br>
-{load_avg}: [winix_loadavg_now], [winix_loadavg_1], [winix_loadavg_5], [winix_loadavg_15]<br>
-{req_per_sec}: [winix_req_per_sec_now], [winix_req_per_sec_1], [winix_req_per_sec_5], [winix_req_per_sec_15]
-</p>
+</td>
+</tr>
+
+<tr>
+<th>{uptime_how_many_sessions}</th><td>[winix_how_many_sessions]</td>
+</tr>
+
+<tr>
+<th>{uptime_users_logged}</th><td>[winix_users_logged]</td>
+</tr>
+
+<tr>
+<th>{load_avg}</th><td>[winix_loadavg_now], [winix_loadavg_1], [winix_loadavg_5], [winix_loadavg_15]</td>
+</tr>
+
+<tr>
+<th>{req_per_sec}</th><td>[winix_req_per_sec_now], [winix_req_per_sec_1], [winix_req_per_sec_5], [winix_req_per_sec_15]</td>
+</tr>
+
+</table>
 
 
 </div>