diff --git a/resources/views/settings/security/2fa/partial/disabled-panel.blade.php b/resources/views/settings/security/2fa/partial/disabled-panel.blade.php
new file mode 100644
index 000000000..9c1f1be14
--- /dev/null
+++ b/resources/views/settings/security/2fa/partial/disabled-panel.blade.php
@@ -0,0 +1,18 @@
+<ul class="list-group">
+	<li class="list-group-item bg-light">
+		<div class="text-center py-5 px-4">
+			<p class="text-muted">
+				<i class="fas fa-lock fa-2x"></i>
+			</p>
+			<p class="text-muted h4 font-weight-bold">
+				Two factor authentication is not enabled yet.
+			</p>
+			<p class="text-muted">
+				Two-factor authentication adds an additional layer of security to your account by requiring more than just a password to log in. <a href="#">Learn more</a>.
+			</p>
+			<p class="mb-0">
+				<a class="btn btn-success font-weight-bold" href="{{route('settings.security.2fa.setup')}}">Enable two-factor authentication</a>
+			</p>
+		</div>
+	</li>
+</ul>
\ No newline at end of file
diff --git a/resources/views/settings/security/2fa/partial/edit-panel.blade.php b/resources/views/settings/security/2fa/partial/edit-panel.blade.php
new file mode 100644
index 000000000..b9149e0ca
--- /dev/null
+++ b/resources/views/settings/security/2fa/partial/edit-panel.blade.php
@@ -0,0 +1,30 @@
+<p>Two-factor authentication adds an additional layer of security to your account by requiring more than just a password to log in. <a href="#">Learn more</a>.</p>
+<div class="card mb-3">
+	<div class="card-header bg-light">
+		<span class="font-weight-bold">
+			Two-factor methods
+		</span>
+	</div>
+	<ul class="list-group list-group-flush">
+		<li class="list-group-item">
+			<div class="d-flex justify-content-between align-items-center py-2">
+				<div>Authenticator App</div>
+				<div><a class="btn btn-secondary btn-sm font-weight-bold" href="{{route('settings.security.2fa.edit')}}">Edit</a></div>
+			</div>
+		</li>
+	</ul>
+</div><div class="card mb-3">
+	<div class="card-header bg-light">
+		<span class="font-weight-bold">
+			Recovery Options
+		</span>
+	</div>
+	<ul class="list-group list-group-flush">
+		<li class="list-group-item">
+			<div class="d-flex justify-content-between align-items-center py-2">
+				<div>Recovery Codes</div>
+				<div><a class="btn btn-secondary btn-sm font-weight-bold" href="{{route('settings.security.2fa.recovery')}}">View</a></div>
+			</div>
+		</li>
+	</ul>
+</div>
\ No newline at end of file
diff --git a/resources/views/settings/security/2fa/partial/log-panel.blade.php b/resources/views/settings/security/2fa/partial/log-panel.blade.php
new file mode 100644
index 000000000..7eb8aaf4e
--- /dev/null
+++ b/resources/views/settings/security/2fa/partial/log-panel.blade.php
@@ -0,0 +1,42 @@
+    <div class="mb-4 pb-4">
+      <h4 class="font-weight-bold">Account Log</h4>
+      <hr>
+      <ul class="list-group" style="max-height: 400px;overflow-y: scroll;">
+        @if($activity->count() == 0) 
+        <p class="alert alert-info font-weight-bold">No activity logs found!</p>
+        @endif
+        @foreach($activity as $log)
+        <li class="list-group-item">
+          <div class="media">
+            <div class="media-body">
+              <span class="my-0 font-weight-bold text-muted">
+              	{{$log->action}} - <span class="font-weight-normal">{{$log->message}}</span>
+              </span>
+              <span class="mb-0 text-muted float-right">
+              	{{$log->created_at->diffForHumans(null, false, false, false)}}
+              	<span class="pl-2" data-toggle="collapse" href="#log-details-{{$log->id}}" role="button" aria-expanded="false" aria-controls="log-details-{{$log->id}}">
+              		<i class="fas fa-ellipsis-v"></i>
+              	</span>
+              </span>
+              <div class="collapse" id="log-details-{{$log->id}}">
+              	<div class="py-2">
+              		<p class="mb-0">
+              			<span class="font-weight-bold">IP Address:</span>
+              			<span>
+              				{{$log->ip_address}}
+              			</span>
+              		</p>
+            		<p class="mb-0">
+              			<span class="font-weight-bold">User Agent:</span>
+              			<span>
+              				{{$log->user_agent}}
+              			</span>
+              		</p>
+              	</div>
+              </div>
+            </div>
+          </div>
+        </li>
+        @endforeach
+      </ul>
+    </div>
\ No newline at end of file