diff --git a/resources/themes/pterodactyl/admin/servers/index.blade.php b/resources/themes/pterodactyl/admin/servers/index.blade.php
index ca21e5823..f9a82497a 100644
--- a/resources/themes/pterodactyl/admin/servers/index.blade.php
+++ b/resources/themes/pterodactyl/admin/servers/index.blade.php
@@ -45,6 +45,7 @@
                             <th>Node</th>
                             <th>Connection</th>
                             <th></th>
+                            <th></th>
                         </tr>
                         @foreach ($servers as $server)
                             <tr data-server="{{ $server->uuidShort }}">
@@ -64,6 +65,10 @@
                                         <span class="label label-success">Active</span>
                                     @endif
                                 </td>
+                                <td class="text-center">
+                                    <a class="btn btn-xs btn-default" href="{{ route('server.index', $server->uuidShort) }}"><i class="fa fa-wrench"></i></a>
+                                    <a class="btn btn-xs btn-default console-popout" href="{{ route('server.console', $server->uuidShort) }}"><i class="fa fa-terminal"></i></a>
+                                </td>
                             </tr>
                         @endforeach
                     </tbody>
@@ -78,3 +83,13 @@
     </div>
 </div>
 @endsection
+
+@section('footer-scripts')
+    @parent
+    <script>
+        $('.console-popout').on('click', function (event) {
+            event.preventDefault();
+            window.open($(this).attr('href'), 'Pterodactyl Console', 'width=800,height=400');
+        });
+    </script>
+@endsection
diff --git a/resources/themes/pterodactyl/admin/servers/view/index.blade.php b/resources/themes/pterodactyl/admin/servers/view/index.blade.php
index 6e9855337..58deaa924 100644
--- a/resources/themes/pterodactyl/admin/servers/view/index.blade.php
+++ b/resources/themes/pterodactyl/admin/servers/view/index.blade.php
@@ -10,7 +10,7 @@
 @endsection
 
 @section('content-header')
-    <h1>{{ $server->name }}<small>{{ $server->uuid }}</small></h1>
+    <h1>{{ $server->name }}<small>{{ str_limit($server->description) }}</small></h1>
     <ol class="breadcrumb">
         <li><a href="{{ route('admin.index') }}">Admin</a></li>
         <li><a href="{{ route('admin.servers') }}">Servers</a></li>