diff --git a/app/controllers/admin/communication/application_controller.rb b/app/controllers/admin/communication/application_controller.rb
index f9e5ff5722e8aa43bb5a8d27a0c3934db6c89ab5..0468b4e777de2a83cce2d7743c399a34ca0db1a6 100644
--- a/app/controllers/admin/communication/application_controller.rb
+++ b/app/controllers/admin/communication/application_controller.rb
@@ -1,6 +1,11 @@
 class Admin::Communication::ApplicationController < Admin::ApplicationController
   def breadcrumb
-    super
-    add_breadcrumb Communication.model_name.human
+    if @website
+      short_breadcrumb
+      breadcrumb_for @website
+    else
+      super
+      add_breadcrumb Communication.model_name.human
+    end
   end
 end
diff --git a/app/controllers/admin/communication/website/application_controller.rb b/app/controllers/admin/communication/website/application_controller.rb
index 351e872c3d844f2c3ad9e6936ade85508d792d86..7c1f26e8b59b2a793c5b3255101a44d0b77d8d15 100644
--- a/app/controllers/admin/communication/website/application_controller.rb
+++ b/app/controllers/admin/communication/website/application_controller.rb
@@ -3,11 +3,6 @@ class Admin::Communication::Website::ApplicationController < Admin::Communicatio
 
   protected
 
-  def breadcrumb
-    short_breadcrumb
-    breadcrumb_for @website, website_id: nil
-  end
-
   def default_url_options
     return {} unless params.has_key? :website_id
     {
diff --git a/app/controllers/admin/communication/websites_controller.rb b/app/controllers/admin/communication/websites_controller.rb
index 4a96cf0be729866238f1498871920ba00f95627d..84a2eb91ce7c32c8cb416ccadf1aeb93dc4319f8 100644
--- a/app/controllers/admin/communication/websites_controller.rb
+++ b/app/controllers/admin/communication/websites_controller.rb
@@ -60,12 +60,6 @@ class Admin::Communication::WebsitesController < Admin::Communication::Applicati
 
   protected
 
-  def breadcrumb
-    super
-    add_breadcrumb Communication::Website.model_name.human(count: 2), admin_communication_websites_path
-    breadcrumb_for @website
-  end
-
   def website_params
     params.require(:communication_website).permit(:name, :domain, :repository, :access_token, :about_type, :about_id)
   end
diff --git a/app/views/admin/communication/websites/show.html.erb b/app/views/admin/communication/websites/show.html.erb
index 4b9d3c502d3e352829f7d6cb4af3635e30a7e291..50efde949dc68dfea217f4b8ff9349c0f034bd3e 100644
--- a/app/views/admin/communication/websites/show.html.erb
+++ b/app/views/admin/communication/websites/show.html.erb
@@ -1,8 +1,9 @@
 <% content_for :title, @website %>
 
-<p>
+<% content_for :title_right do %>
   <%= link_to @website.domain_url, @website.domain_url, target: :_blank %>
-</p>
+<% end %>
+
 
 <p>
   <%= I18n.t("activerecord.attributes.communication/website.about_#{@website.about_type}") %>
diff --git a/app/views/admin/layouts/application.html.erb b/app/views/admin/layouts/application.html.erb
index f0cef5d551bf999a8f33c91541cc20c90d46bf39..003a54d20c90c503cb28abc4d82ff577dcc46261 100644
--- a/app/views/admin/layouts/application.html.erb
+++ b/app/views/admin/layouts/application.html.erb
@@ -31,6 +31,7 @@
         <%= render 'admin/application/top' %>
         <main class="content">
           <div class="container-fluid p-0">
+            <p class="float-end pt-2"><%= yield :title_right %></p>
             <h1><%= yield :title %></h1>
             <%= yield %>
           </div>