diff --git a/resources/css/app.css b/resources/css/app.css
index 2809063c9..eefe21a17 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -134,3 +134,27 @@ a {
 .text-helper {
     @apply inline-block font-bold text-warning;
 }
+table {
+    @apply min-w-full divide-y divide-coolgray-200;
+}
+thead {
+    @apply uppercase text-sm;
+}
+tbody {
+    @apply divide-y divide-coolgray-200;
+}
+tr {
+    @apply text-sm text-neutral-400;
+}
+tr th {
+    @apply px-3 py-3.5 text-left text-white;
+}
+tr th:first-child {
+    @apply py-3.5 pl-4 pr-3 sm:pl-6;
+}
+tr td {
+    @apply px-3 py-4 whitespace-nowrap;
+}
+tr td:first-child {
+    @apply pl-4 pr-3 sm:pl-6 font-bold;
+}
diff --git a/resources/views/livewire/project/application/previews.blade.php b/resources/views/livewire/project/application/previews.blade.php
index 0dc3def4d..ee74d1950 100644
--- a/resources/views/livewire/project/application/previews.blade.php
+++ b/resources/views/livewire/project/application/previews.blade.php
@@ -10,11 +10,11 @@
             <div class="pt-1 text-sm">Requests remaning till rate limited by Git: {{ $rate_limit_remaining }}</div>
         @endisset
         @if (count($pull_requests) > 0)
-            <div wire:loading.remove wire:target='load_prs' class="flex gap-4 py-4">
+            <div wire:loading.remove wire:target='load_prs'>
                 <div class="overflow-x-auto table-md">
-                    <table class="table">
+                    <table>
                         <thead>
-                            <tr class="text-warning border-coolgray-200">
+                            <tr>
                                 <th>PR Number</th>
                                 <th>PR Title</th>
                                 <th>Git</th>
@@ -23,7 +23,7 @@
                         </thead>
                         <tbody>
                             @foreach ($pull_requests as $pull_request)
-                                <tr class="border-coolgray-200">
+                                <tr>
                                     <th>{{ data_get($pull_request, 'number') }}</th>
                                     <td>{{ data_get($pull_request, 'title') }}</td>
                                     <td>
@@ -33,7 +33,7 @@
                                             <x-external-link />
                                         </a>
                                     </td>
-                                    <td class="flex items-center justify-center gap-2">
+                                    <td>
                                         <x-forms.button
                                             wire:click="deploy('{{ data_get($pull_request, 'number') }}', '{{ data_get($pull_request, 'html_url') }}')">
                                             Deploy
diff --git a/resources/views/livewire/team/invitations.blade.php b/resources/views/livewire/team/invitations.blade.php
index fcb477a0a..8fe167d55 100644
--- a/resources/views/livewire/team/invitations.blade.php
+++ b/resources/views/livewire/team/invitations.blade.php
@@ -2,9 +2,9 @@
     @if ($invitations->count() > 0)
         <h4 class="pb-2">Pending Invitations</h4>
         <div class="overflow-x-auto">
-            <table class="table">
+            <table>
                 <thead>
-                    <tr class="font-bold text-white uppercase border-coolgray-200">
+                    <tr>
                         <th>Email</th>
                         <th>Via</th>
                         <th>Role</th>
@@ -15,7 +15,7 @@
                 <tbody x-data>
 
                     @foreach ($invitations as $invite)
-                        <tr class="border-coolgray-200">
+                        <tr>
                             <td>{{ $invite->email }}</td>
                             <td>{{ $invite->via }}</td>
                             <td>{{ $invite->role }}</td>
diff --git a/resources/views/livewire/team/member.blade.php b/resources/views/livewire/team/member.blade.php
index a287c5f80..a2b9e4d6e 100644
--- a/resources/views/livewire/team/member.blade.php
+++ b/resources/views/livewire/team/member.blade.php
@@ -1,8 +1,9 @@
-<tr class="border-coolgray-200">
-    {{-- <th class="text-warning">{{ $member->id }}</th> --}}
-    <th>{{ $member->name }}</th>
+<tr>
+    <td>
+        {{ $member->name }}</th>
     <td>{{ $member->email }}</td>
-    <td>{{ data_get($member, 'pivot.role') }}</td>
+    <td>
+        {{ data_get($member, 'pivot.role') }}</td>
     <td>
         {{-- TODO: This is not good --}}
         @if (auth()->user()->isAdmin())
diff --git a/resources/views/team/show.blade.php b/resources/views/team/show.blade.php
index 8f883f92d..618a01e87 100644
--- a/resources/views/team/show.blade.php
+++ b/resources/views/team/show.blade.php
@@ -1,10 +1,10 @@
 <x-layout>
     <x-team.navbar :team="session('currentTeam')" />
     <h2>Members</h2>
-    <div class="overflow-x-auto">
-        <table class="table">
+    <div class="overflow-hidden">
+        <table>
             <thead>
-                <tr class="font-bold text-white uppercase border-coolgray-200">
+                <tr>
                     <th>Name</th>
                     <th>Email</th>
                     <th>Role</th>
@@ -33,8 +33,6 @@
             @endif
             <livewire:team.invite-link />
         </div>
-
-
         <livewire:team.invitations :invitations="$invitations" />
     @endif
 </x-layout>