diff --git a/resources/themes/pterodactyl/admin/nodes/index.blade.php b/resources/themes/pterodactyl/admin/nodes/index.blade.php
index 25459e46..a96d3224 100644
--- a/resources/themes/pterodactyl/admin/nodes/index.blade.php
+++ b/resources/themes/pterodactyl/admin/nodes/index.blade.php
@@ -95,8 +95,14 @@
                     title: 'v' + data.version,
                 });
                 $(element).removeClass('text-muted').find('i').removeClass().addClass('fa fa-fw fa-heartbeat faa-pulse animated').css('color', '#50af51');
-            }).fail(function () {
+            }).fail(function (error) {
+                var errorText = 'Error connecting to node! Check browser console for details.';
+                try {
+                    errorText = error.responseJSON.errors[0].detail || errorText;
+                } catch (ex) {}
+
                 $(element).removeClass('text-muted').find('i').removeClass().addClass('fa fa-fw fa-heart-o').css('color', '#d9534f');
+                $(element).find('i').tooltip({ title: errorText });
             });
         }).promise().done(function () {
             setTimeout(pingNodes, 10000);
diff --git a/resources/themes/pterodactyl/admin/servers/index.blade.php b/resources/themes/pterodactyl/admin/servers/index.blade.php
index f9a82497..24fe4d81 100644
--- a/resources/themes/pterodactyl/admin/servers/index.blade.php
+++ b/resources/themes/pterodactyl/admin/servers/index.blade.php
@@ -39,8 +39,8 @@
                 <table class="table table-hover">
                     <tbody>
                         <tr>
-                            <th>ID</th>
                             <th>Server Name</th>
+                            <th>UUID</th>
                             <th>Owner</th>
                             <th>Node</th>
                             <th>Connection</th>
@@ -49,8 +49,8 @@
                         </tr>
                         @foreach ($servers as $server)
                             <tr data-server="{{ $server->uuidShort }}">
-                                <td><code title="{{ $server->uuid }}">{{ $server->uuidShort }}</code></td>
                                 <td><a href="{{ route('admin.servers.view', $server->id) }}">{{ $server->name }}</a></td>
+                                <td><code title="{{ $server->uuid }}">{{ $server->uuid }}</code></td>
                                 <td><a href="{{ route('admin.users.view', $server->user->id) }}">{{ $server->user->username }}</a></td>
                                 <td><a href="{{ route('admin.nodes.view', $server->node->id) }}">{{ $server->node->name }}</a></td>
                                 <td>