diff --git a/resources/views/admin/users.blade.php b/resources/views/admin/users.blade.php
index 621e618..b179f5f 100644
--- a/resources/views/admin/users.blade.php
+++ b/resources/views/admin/users.blade.php
@@ -49,14 +49,28 @@
                 Username:
             </div>
             @if (!empty($user->id))
+            @if (!empty($user->name))
             <a href="{{ route('profile', $user->id) }}" title="{{ $user->name }}'s profile" class="AuthenticatedUserName">
-                @if (!empty($user->name)) {{ $user->name }} @else N/A @endif
+                {{ $user->name }}
             </a>
+            @else
+            <a title="N/A" class="info-error">
+                N/A
+            </a>
+            @endif
             @unless (request()->query('q'))
+            @if (!empty($user->name))
             <a href="/admin/users?q={{ $user->id }}&searchBy=id" title="{{ $user->name }}'s Details" class="AuthenticatedUserName userInfo"></a>
+            @else
+            <a href="/admin/users?q={{ $user->id }}&searchBy=id" title="N/A" class="AuthenticatedUserName userInfo"></a>
+            @endif
             @endunless
+            @if (!empty($user->name))
             <a href="/admin/tree?q={{ $user->id }}&searchBy=id" title="{{ $user->name }}'s Invite Tree" class="forwardArrow AuthenticatedUserName"></a>
             @else
+            <a href="/admin/tree?q={{ $user->id }}&searchBy=id" title="N/A" class="forwardArrow AuthenticatedUserName"></a>
+            @endif
+            @else
             <a title="N/A" class="info-error">
                 N/A
             </a>
@@ -209,6 +223,7 @@
                 Invited By
             </div>
             @if (!empty($user->id))
+            @if (!empty(App\Models\User::where('id', $user->invited_by)->first()->id))
             <a href="{{ route('profile', App\Models\User::where('id', $user->invited_by)->first()->id) }}" title="{{ App\Models\User::where('id', $user->invited_by)->first()->name }}'s Profile" class="AuthenticatedUserName">
                 {{ App\Models\User::where('id', $user->invited_by)->first()->name }}
             </a>
@@ -217,10 +232,11 @@
             @endunless
             <a href="/admin/tree?q={{ App\Models\User::where('id', $user->invited_by)->first()->id }}&searchBy=id" title="{{ App\Models\User::where('id', $user->invited_by)->first()->name }}'s Invite Tree" class="forwardArrow AuthenticatedUserName"></a>
             @else
-            <div class="info-error">
+            <div title="N/A" class="info-error">
                 N/A
             </a>
             @endif
+            @endif
         </div>
         <div class="Row">
             <div class="text-secondary">
@@ -230,7 +246,7 @@
                 @if ($user->admin)
                     Admin
                 @else
-                    Member
+                    User
                 @endif
             </div>
         </div>
@@ -288,15 +304,21 @@
                             @if ($user->admin)
                                 Admin
                             @else
-                                Member
+                                User
                             @endif
                         </p>
                         <p><strong>Status:</strong> Normal</p>
-                                    <!-- Note to Tersis/Conkley, please revert this change sooner or later. I'm tired and might fix the !empty issue later. -->
-                        <p><strong>Invited By:</strong> <a style="color:blue"
-                                href="#">N/A</a>
+                        @if (!empty($user->id))
+                        @if (!empty(App\Models\User::where('id', $user->invited_by)->first()->id))
+                        <p><strong>Invited By:</strong> <a style="color:blue">{{ App\Models\User::where('id', $user->invited_by)->first()->name }}</a>
+                            (ID: {{ App\Models\User::where('id', $user->invited_by)->first()->id }})
+                        </p>
+                        @else
+                        <p><strong>Invited By:</strong> <a style="color:blue">N/A</a>
                             (ID: N/A)
                         </p>
+                        @endif
+                        @endif
                         <!--
                                 <button class="greybutton">Check Reports For This User</button>
                                 <button class="bluebutton">Edit User Data</button>
diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php
index e9f1bd6..27e0e67 100644
--- a/resources/views/layouts/admin.blade.php
+++ b/resources/views/layouts/admin.blade.php
@@ -23,7 +23,7 @@
 <body class="NewPanel">
     @yield('alert')
 
-    <div id="MasterContainer" class="AdminPanel EnableLogoutBtn" style="width: 100%;">
+    <div id="MasterContainer" class="AdminPanel" style="width: 100%;">
     <div id="AdminWrapper" class="Navigation">
         <div class="AdminHeader">
             <span><a href="{{ route('home') }}" title="ARCHBLOX Home" class="SiteBrand"></a></span>
@@ -37,7 +37,6 @@
             <a href="{{ route('logout') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();" class="logout AuthenticatedUserName">Logout</a>
             <span class="logoutarrow"><span>
             </div>
-        </a>
         </div>
         <form id="logout-form" class="hidden" action="{{ route('logout') }}" method="POST">
             @csrf
@@ -59,12 +58,13 @@
                     Invite Tree
                 </a>
             </li>
+            </ul>
         </div>
-        </ul>
     </div>
     <div id="BodyWrapper">
         @yield('Body')
     </div>
+    </div>
     <div class="iphone-sidebar">
         <img href="{{ route('admin_index') }}" src="https://archblox.com/img/MORBLOXlogo.png" width="50%">
         <p>Admin Panel</p>
@@ -81,7 +81,6 @@
     <div class="iphone-content">
         @yield('content')
     </div>
-    </div>
 </body>
 
 </html>