diff --git a/app/views/oauth2_applications/_application.html.erb b/app/views/oauth2_applications/_application.html.erb
index f08f7be93..564fa81eb 100644
--- a/app/views/oauth2_applications/_application.html.erb
+++ b/app/views/oauth2_applications/_application.html.erb
@@ -1,7 +1,7 @@
 <tr>
   <td class="align-middle">
     <ul class="list-unstyled mb-0">
-      <li><%= application.name %></li>
+      <li><%= link_to application.name, oauth_application_path(application) %></li>
       <% application.redirect_uri.split.each do |uri| -%>
         <li class="text-muted"><%= uri %></li>
       <% end -%>
diff --git a/app/views/oauth2_applications/index.html.erb b/app/views/oauth2_applications/index.html.erb
index a2d4cc089..240b34d31 100644
--- a/app/views/oauth2_applications/index.html.erb
+++ b/app/views/oauth2_applications/index.html.erb
@@ -2,12 +2,22 @@
   <h1><%= t ".title" %></h1>
 <% end %>
 
+<% if @applications.length > 0 %>
+  <table class="table table-borderless table-striped">
+    <thead>
+      <th><%= t ".name" %></th>
+      <th><%= t ".permissions" %></th>
+      <th></th>
+      <th></th>
+    </thead>
+    <tbody>
+      <%= render :partial => "application", :collection => @applications %>
+    </tbody>
+  </table>
+<% else %>
+  <p><%= t ".no_applications_html", :oauth2 => link_to(t(".oauth_2"), "https://oauth.net/2/") %></p>
+<% end %>
+
 <p>
   <%= link_to t(".new"), new_oauth_application_path, :class => "btn btn-outline-primary" %>
 </p>
-
-<table class="table table-borderless table-striped">
-  <tbody>
-    <%= render :partial => "application", :collection => @applications %>
-  </tbody>
-</table>
diff --git a/app/views/oauth2_applications/show.html.erb b/app/views/oauth2_applications/show.html.erb
index 1a991f0c6..e8ab7836d 100644
--- a/app/views/oauth2_applications/show.html.erb
+++ b/app/views/oauth2_applications/show.html.erb
@@ -42,3 +42,8 @@
     </td>
   </tr>
 </table>
+
+<div>
+  <%= link_to t(".edit"), edit_oauth_application_path(@application), :class => "btn btn-outline-primary" %>
+  <%= link_to t(".delete"), oauth_application_path(@application), { :method => :delete, :class => "btn btn-outline-danger", :data => { :confirm => t(".confirm_delete") } } %>
+</td>
diff --git a/app/views/oauth2_authorizations/new.html.erb b/app/views/oauth2_authorizations/new.html.erb
index 00d2a01af..3b943a043 100644
--- a/app/views/oauth2_authorizations/new.html.erb
+++ b/app/views/oauth2_authorizations/new.html.erb
@@ -10,31 +10,29 @@
   <% end -%>
 </ul>
 
-<div class="container">
-  <div class="row justify-content-start">
-    <div class="col-auto pl-0">
-      <%= bootstrap_form_tag :action => :create do |f| %>
-        <%= f.hidden_field :client_id, :value => @pre_auth.client.uid %>
-        <%= f.hidden_field :redirect_uri, :value => @pre_auth.redirect_uri %>
-        <%= f.hidden_field :state, :value => @pre_auth.state %>
-        <%= f.hidden_field :response_type, :value => @pre_auth.response_type %>
-        <%= f.hidden_field :scope, :value => @pre_auth.scope %>
-        <%= f.hidden_field :code_challenge, :value => @pre_auth.code_challenge %>
-        <%= f.hidden_field :code_challenge_method, :value => @pre_auth.code_challenge_method %>
-        <%= f.primary t(".authorize") %>
-      <% end %>
-    </div>
-    <div class="col-auto pl-0">
-      <%= bootstrap_form_tag :action => :destroy, :html => { :method => :delete } do |f| %>
-        <%= f.hidden_field :client_id, :value => @pre_auth.client.uid %>
-        <%= f.hidden_field :redirect_uri, :value => @pre_auth.redirect_uri %>
-        <%= f.hidden_field :state, :value => @pre_auth.state %>
-        <%= f.hidden_field :response_type, :value => @pre_auth.response_type %>
-        <%= f.hidden_field :scope, :value => @pre_auth.scope %>
-        <%= f.hidden_field :code_challenge, :value => @pre_auth.code_challenge %>
-        <%= f.hidden_field :code_challenge_method, :value => @pre_auth.code_challenge_method %>
-        <%= f.submit t(".deny") %>
-      <% end %>
-    </div>
+<div class="row justify-content-start no-gutters mx-n1">
+  <div class="col-auto mx-1">
+    <%= bootstrap_form_tag :action => :create do |f| %>
+      <%= f.hidden_field :client_id, :value => @pre_auth.client.uid %>
+      <%= f.hidden_field :redirect_uri, :value => @pre_auth.redirect_uri %>
+      <%= f.hidden_field :state, :value => @pre_auth.state %>
+      <%= f.hidden_field :response_type, :value => @pre_auth.response_type %>
+      <%= f.hidden_field :scope, :value => @pre_auth.scope %>
+      <%= f.hidden_field :code_challenge, :value => @pre_auth.code_challenge %>
+      <%= f.hidden_field :code_challenge_method, :value => @pre_auth.code_challenge_method %>
+      <%= f.primary t(".authorize") %>
+    <% end %>
+  </div>
+  <div class="col-auto mx-1">
+    <%= bootstrap_form_tag :action => :destroy, :html => { :method => :delete } do |f| %>
+      <%= f.hidden_field :client_id, :value => @pre_auth.client.uid %>
+      <%= f.hidden_field :redirect_uri, :value => @pre_auth.redirect_uri %>
+      <%= f.hidden_field :state, :value => @pre_auth.state %>
+      <%= f.hidden_field :response_type, :value => @pre_auth.response_type %>
+      <%= f.hidden_field :scope, :value => @pre_auth.scope %>
+      <%= f.hidden_field :code_challenge, :value => @pre_auth.code_challenge %>
+      <%= f.hidden_field :code_challenge_method, :value => @pre_auth.code_challenge_method %>
+      <%= f.submit t(".deny") %>
+    <% end %>
   </div>
 </div>
diff --git a/app/views/oauth2_authorized_applications/_application.html.erb b/app/views/oauth2_authorized_applications/_application.html.erb
index f8e9a1185..3781c1df3 100644
--- a/app/views/oauth2_authorized_applications/_application.html.erb
+++ b/app/views/oauth2_authorized_applications/_application.html.erb
@@ -1,6 +1,6 @@
 <tr>
   <td class="align-middle">
-    <%= application.name %>
+    <%= link_to application.name, oauth_application_path(application) %>
   </td>
   <td class="align-middle">
     <ul class="list-unstyled mb-0">
diff --git a/app/views/oauth2_authorized_applications/index.html.erb b/app/views/oauth2_authorized_applications/index.html.erb
index dca65e9f9..336de1406 100644
--- a/app/views/oauth2_authorized_applications/index.html.erb
+++ b/app/views/oauth2_authorized_applications/index.html.erb
@@ -2,13 +2,17 @@
   <h1><%= t ".title" %></h1>
 <% end %>
 
-<table class="table table-borderless table-striped">
-  <thead>
-    <th><%= t ".application" %></th>
-    <th><%= t ".permissions" %></th>
-    <th></th>
-  </thead>
-  <tbody>
-    <%= render :partial => "application", :collection => @applications %>
-  </tbody>
-</table>
+<% if @applications.length > 0 %>
+  <table class="table table-borderless table-striped">
+    <thead>
+      <th><%= t ".application" %></th>
+      <th><%= t ".permissions" %></th>
+      <th></th>
+    </thead>
+    <tbody>
+      <%= render :partial => "application", :collection => @applications %>
+    </tbody>
+  </table>
+<% else %>
+  <p><%= t ".no_applications_html", :oauth2 => link_to(t(".oauth_2"), "https://oauth.net/2/") %></p>
+<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index dfb8c25eb..91a39eb5c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2329,7 +2329,11 @@ en:
   oauth2_applications:
     index:
       title: "My client applications"
-      new: "Create new application"
+      no_applications_html: "Do you have an application you would like to register for use with us using the %{oauth2} standard? You must register your application before it can make OAuth requests to this service."
+      oauth_2: "OAuth 2"
+      new: "Register new application"
+      name: "Name"
+      permissions: "Permissions"
     application:
       edit: "Edit"
       delete: "Delete"
@@ -2339,6 +2343,9 @@ en:
     edit:
       title: "Edit your application"
     show:
+      edit: "Edit"
+      delete: "Delete"
+      confirm_delete: "Delete this application?"
       client_id: "Client ID"
       client_secret: "Client Secret"
       client_secret_warning: "Make sure to save this secret - it will not be accessible again"
@@ -2364,6 +2371,7 @@ en:
       title: "My authorized applications"
       application: "Application"
       permissions: "Permissions"
+      no_applications_html: "You have not yet authorized any %{oauth2} applications."
     application:
       revoke: "Revoke Access"
       confirm_revoke: "Revoke access for this application?"