diff --git a/resources/themes/pterodactyl/admin/index.blade.php b/resources/themes/pterodactyl/admin/index.blade.php
index 0385837af..76f0ed3f6 100644
--- a/resources/themes/pterodactyl/admin/index.blade.php
+++ b/resources/themes/pterodactyl/admin/index.blade.php
@@ -61,6 +61,7 @@
     <div class="col-xs-6 col-sm-3 text-center">
         <a href="https://docs.pterodactyl.io"><button class="btn btn-primary" style="width:100%;"><i class="fa fa-fw fa-link"></i> Documentation</button></a>
     </div>
+    <div class="clearfix visible-xs-block">&nbsp;</div>
     <div class="col-xs-6 col-sm-3 text-center">
         <a href="https://github.com/Pterodactyl/Panel"><button class="btn btn-primary" style="width:100%;"><i class="fa fa-fw fa-support"></i> Github</button></a>
     </div>
diff --git a/resources/themes/pterodactyl/admin/nodes/index.blade.php b/resources/themes/pterodactyl/admin/nodes/index.blade.php
index 9bef0180e..279cc31f8 100644
--- a/resources/themes/pterodactyl/admin/nodes/index.blade.php
+++ b/resources/themes/pterodactyl/admin/nodes/index.blade.php
@@ -44,8 +44,8 @@
                 <h3 class="box-title">Node List</h3>
                 <div class="box-tools">
                     <form action="{{ route('admin.nodes') }}" method="GET">
-                        <div class="input-group input-group-sm" style="width: 300px;">
-                            <input type="text" name="query" class="form-control pull-right" value="{{ request()->input('query') }}" placeholder="Search Nodes">
+                        <div class="input-group input-group-sm">
+                            <input type="text" name="query" class="form-control pull-right" style="width:30%;" value="{{ request()->input('query') }}" placeholder="Search Nodes">
                             <div class="input-group-btn">
                                 <button type="submit" class="btn btn-default"><i class="fa fa-search"></i></button>
                                 <a href="{{ route('admin.nodes.new') }}"><button type="button" class="btn btn-sm btn-primary" style="border-radius: 0 3px 3px 0;margin-left:-1px;">Create New</button></a>
diff --git a/resources/themes/pterodactyl/admin/packs/index.blade.php b/resources/themes/pterodactyl/admin/packs/index.blade.php
index a4da22809..ca21678c0 100644
--- a/resources/themes/pterodactyl/admin/packs/index.blade.php
+++ b/resources/themes/pterodactyl/admin/packs/index.blade.php
@@ -39,8 +39,8 @@
                 <h3 class="box-title">Pack List</h3>
                 <div class="box-tools">
                     <form action="{{ route('admin.packs') }}" method="GET">
-                        <div class="input-group input-group-sm" style="width: 300px;">
-                            <input type="text" name="query" class="form-control pull-right" value="{{ request()->input('query') }}" placeholder="Search Packs">
+                        <div class="input-group input-group-sm">
+                            <input type="text" name="query" class="form-control pull-right" style="width:30%;" value="{{ request()->input('query') }}" placeholder="Search Packs">
                             <div class="input-group-btn">
                                 <button type="submit" class="btn btn-default"><i class="fa fa-search"></i></button>
                                 <a href="{{ route('admin.packs.new') }}"><button type="button" class="btn btn-sm btn-primary" style="border-radius: 0 3px 3px 0;margin-left:-1px;">Create New</button></a>
diff --git a/resources/themes/pterodactyl/admin/servers/index.blade.php b/resources/themes/pterodactyl/admin/servers/index.blade.php
index 3a59f266e..8a2dd35ed 100644
--- a/resources/themes/pterodactyl/admin/servers/index.blade.php
+++ b/resources/themes/pterodactyl/admin/servers/index.blade.php
@@ -39,8 +39,8 @@
                 <h3 class="box-title">Server List</h3>
                 <div class="box-tools">
                     <form action="{{ route('admin.servers') }}" method="GET">
-                        <div class="input-group input-group-sm" style="width: 300px;">
-                            <input type="text" name="query" class="form-control pull-right" value="{{ request()->input('query') }}" placeholder="Search Servers">
+                        <div class="input-group input-group-sm">
+                            <input type="text" name="query" class="form-control pull-right" style="width:30%;" value="{{ request()->input('query') }}" placeholder="Search Servers">
                             <div class="input-group-btn">
                                 <button type="submit" class="btn btn-default"><i class="fa fa-search"></i></button>
                                 <a href="{{ route('admin.servers.new') }}"><button type="button" class="btn btn-sm btn-primary" style="border-radius: 0 3px 3px 0;margin-left:-1px;">Create New</button></a>
diff --git a/resources/themes/pterodactyl/admin/users/index.blade.php b/resources/themes/pterodactyl/admin/users/index.blade.php
index 761f267a0..acb7e2a3f 100644
--- a/resources/themes/pterodactyl/admin/users/index.blade.php
+++ b/resources/themes/pterodactyl/admin/users/index.blade.php
@@ -39,8 +39,8 @@
                 <h3 class="box-title">User List</h3>
                 <div class="box-tools">
                     <form action="{{ route('admin.users') }}" method="GET">
-                        <div class="input-group input-group-sm" style="width: 300px;">
-                            <input type="text" name="query" class="form-control pull-right" value="{{ request()->input('query') }}" placeholder="Search">
+                        <div class="input-group input-group-sm">
+                            <input type="text" name="query" class="form-control pull-right" style="width:30%;" value="{{ request()->input('query') }}" placeholder="Search">
                             <div class="input-group-btn">
                                 <button type="submit" class="btn btn-default"><i class="fa fa-search"></i></button>
                                 <a href="{{ route('admin.users.new') }}"><button type="button" class="btn btn-sm btn-primary" style="border-radius: 0 3px 3px 0;margin-left:-1px;">Create New</button></a>
diff --git a/resources/themes/pterodactyl/base/index.blade.php b/resources/themes/pterodactyl/base/index.blade.php
index 878fc895c..c8da334db 100644
--- a/resources/themes/pterodactyl/base/index.blade.php
+++ b/resources/themes/pterodactyl/base/index.blade.php
@@ -39,8 +39,8 @@
                 <h3 class="box-title">@lang('base.index.list')</h3>
                 <div class="box-tools">
                     <form action="{{ route('index') }}" method="GET">
-                        <div class="input-group input-group-sm" style="width: 250px;">
-                            <input type="text" name="query" class="form-control pull-right" value="{{ request()->input('query') }}" placeholder="@lang('strings.search')">
+                        <div class="input-group input-group-sm">
+                            <input type="text" name="query" class="form-control pull-right" style="width:30%;" value="{{ request()->input('query') }}" placeholder="@lang('strings.search')">
                             <div class="input-group-btn">
                                 <button type="submit" class="btn btn-default"><i class="fa fa-search"></i></button>
                             </div>
diff --git a/resources/themes/pterodactyl/layouts/admin.blade.php b/resources/themes/pterodactyl/layouts/admin.blade.php
index 5960e3606..db9e13550 100644
--- a/resources/themes/pterodactyl/layouts/admin.blade.php
+++ b/resources/themes/pterodactyl/layouts/admin.blade.php
@@ -75,9 +75,6 @@
                                     <span class="hidden-xs">{{ Auth::user()->name_first }} {{ Auth::user()->name_last }}</span>
                                 </a>
                             </li>
-                            <li>
-                                <a href="#" data-action="control-sidebar" data-toggle="tooltip" data-placement="bottom" title="Quick Access"><i class="fa fa-fighter-jet"></i></a>
-                            </li>
                             <li>
                                 <li><a href="{{ route('index') }}" data-toggle="tooltip" data-placement="bottom" title="Exit Admin Control"><i class="fa fa-server"></i></a></li>
                             </li>
@@ -172,54 +169,12 @@
                 </section>
             </div>
             <footer class="main-footer">
-                <div class="pull-right hidden-xs small text-gray" style="margin-right:10px;">
-                    <strong>v</strong> {{ config('app.version') }} &nbsp;&nbsp; <small class="muted muted-hover"><a href="https://patreon.com/pterry" target="_blank"><i class="fa fa-credit-card"></i></a></small>
+                <div class="pull-right small text-gray" style="margin-right:10px;margin-top:-7px;">
+                    <strong><i class="fa fa-code-fork"></i></strong> {{ config('app.version') }} <br />
+                    <strong><i class="fa fa-clock-o"></i></strong> {{ round(microtime(true) - LARAVEL_START, 3) }}s
                 </div>
                 Copyright &copy; 2015 - {{ date('Y') }} <a href="https://pterodactyl.io/">Pterodactyl Software</a>.
             </footer>
-            <aside class="control-sidebar control-sidebar-dark">
-                <ul class="nav nav-tabs nav-justified control-sidebar-tabs">
-                    <li class="active"><a href="#control-sidebar-servers-tab" data-toggle="tab"><i class="fa fa-server"></i></a></li>
-                    <li><a href="#control-sidebar-nodes-tab" data-toggle="tab"><i class="fa fa-sitemap"></i></a></li>
-                </ul>
-                <div class="tab-content">
-                    <div class="tab-pane active" id="control-sidebar-servers-tab">
-                        <ul class="control-sidebar-menu">
-                            @foreach (Pterodactyl\Models\Server::all() as $s)
-                                <li>
-                                    <a href="{{ route('admin.servers.view', $s->id) }}">
-                                        @if($s->owner_id === Auth::user()->id)
-                                            <i class="menu-icon fa fa-user bg-blue"></i>
-                                        @else
-                                            <i class="menu-icon fa fa-user-o bg-gray"></i>
-                                        @endif
-                                        <div class="menu-info">
-                                            <h4 class="control-sidebar-subheading">{{ $s->name }}</h4>
-                                            <p>{{ $s->username }}</p>
-                                        </div>
-                                    </a>
-                                </li>
-                            @endforeach
-                        </ul>
-                    </div>
-                    <div class="tab-pane" id="control-sidebar-nodes-tab">
-                        <ul class="control-sidebar-menu">
-                            @foreach (Pterodactyl\Models\Node::with('location')->get() as $n)
-                                <li>
-                                    <a href="{{ route('admin.nodes.view', $n->id) }}">
-                                        <i class="menu-icon fa fa-codepen bg-gray"></i>
-                                        <div class="menu-info">
-                                            <h4 class="control-sidebar-subheading">{{ $n->name }}</h4>
-                                            <p>{{ $n->location->short }}</p>
-                                        </div>
-                                    </a>
-                                </li>
-                            @endforeach
-                        </ul>
-                    </div>
-                </div>
-            </aside>
-            <div class="control-sidebar-bg"></div>
         </div>
         @section('footer-scripts')
             {!! Theme::js('vendor/terminal/keyboard.polyfill.js') !!}
diff --git a/resources/themes/pterodactyl/layouts/master.blade.php b/resources/themes/pterodactyl/layouts/master.blade.php
index 951aa116c..579571bc1 100644
--- a/resources/themes/pterodactyl/layouts/master.blade.php
+++ b/resources/themes/pterodactyl/layouts/master.blade.php
@@ -227,8 +227,9 @@
                 </section>
             </div>
             <footer class="main-footer">
-                <div class="pull-right hidden-xs small text-gray" style="margin-right:10px;">
-                    <strong>v</strong> {{ config('app.version') }} &nbsp;&nbsp; <small class="muted muted-hover"><a href="https://patreon.com/pterry" target="_blank"><i class="fa fa-credit-card"></i></a></small>
+                <div class="pull-right small text-gray" style="margin-right:10px;margin-top:-7px;">
+                    <strong><i class="fa fa-code-fork"></i></strong> {{ config('app.version') }} <br />
+                    <strong><i class="fa fa-clock-o"></i></strong> {{ round(microtime(true) - LARAVEL_START, 3) }}s
                 </div>
                 Copyright &copy; 2015 - {{ date('Y') }} <a href="https://pterodactyl.io/">Pterodactyl Software</a>.
             </footer>