diff --git a/resources/themes/pterodactyl/server/tasks/index.blade.php b/resources/themes/pterodactyl/server/tasks/index.blade.php
index cd0f529e3..738cb8b14 100644
--- a/resources/themes/pterodactyl/server/tasks/index.blade.php
+++ b/resources/themes/pterodactyl/server/tasks/index.blade.php
@@ -38,6 +38,9 @@
         <div class="box">
             <div class="box-header with-border">
                 <h3 class="box-title">@lang('server.tasks.current')</h3>
+                <div class="box-tools">
+                    <a href="{{ route('server.tasks.new', $server->uuidShort) }}"><button class="btn btn-primary btn-sm">Create New</button></a>
+                </div>
             </div>
             <div class="box-body table-responsive no-padding">
                 <table class="table table-hover">
@@ -82,11 +85,6 @@
                     </tbody>
                 </table>
             </div>
-            <div class="box-footer">
-                <a href="{{ route('server.tasks.new', $server->uuidShort) }}">
-                    <button class="btn btn-sm btn-primary">@lang('server.tasks.new_task')</button>
-                </a>
-            </div>
         </div>
     </div>
 </div>
diff --git a/resources/themes/pterodactyl/server/users/index.blade.php b/resources/themes/pterodactyl/server/users/index.blade.php
index b8f757a4e..a11261e5a 100644
--- a/resources/themes/pterodactyl/server/users/index.blade.php
+++ b/resources/themes/pterodactyl/server/users/index.blade.php
@@ -38,6 +38,11 @@
         <div class="box">
             <div class="box-header with-border">
                 <h3 class="box-title">@lang('server.users.list')</h3>
+                @can('create-subuser', $server)
+                    <div class="box-tools">
+                        <a href="{{ route('server.subusers.new', $server->uuidShort) }}"><button class="btn btn-primary btn-sm">Create New</button></a>
+                    </div>
+                @endcan
             </div>
             <div class="box-body table-responsive no-padding">
                 <table class="table table-hover">
@@ -83,11 +88,6 @@
                     </tbody>
                 </table>
             </div>
-            @can('create-subuser', $server)
-                <div class="box-footer with-border">
-                    <a href="{{ route('server.subusers.new', $server->uuidShort) }}"><button class="btn btn-sm btn-success pull-right">@lang('server.users.add')</button></a>
-                </div>
-            @endcan
         </div>
     </div>
 </div>