diff --git a/app/cells/decidim/author/avatar_image.erb b/app/cells/decidim/author/avatar_image.erb
new file mode 100644
index 0000000..bbdfdd5
--- /dev/null
+++ b/app/cells/decidim/author/avatar_image.erb
@@ -0,0 +1,9 @@
+<% if model.is_a?(Decidim::User) %>
+  <% if mode.public? %>
+    <%= image_tag model.avatar_url, alt: t("decidim.author.avatar", name: display_name), class: "author__avatar" %>
+  <% else %>
+    <%= image_tag model.default_avatar_url, alt: t("decidim.author.avatar", name: display_name), class: "author__avatar" %>
+  <% end %>
+<% else %>
+  <%= image_tag model.avatar_url, alt: t("decidim.author.avatar", name: display_name), class: "author__avatar" %>
+<% end %>
diff --git a/app/cells/decidim/author/profile_minicard.erb b/app/cells/decidim/author/profile_minicard.erb
new file mode 100644
index 0000000..d4790a7
--- /dev/null
+++ b/app/cells/decidim/author/profile_minicard.erb
@@ -0,0 +1,32 @@
+<div class="author__tooltip" role="tooltip">
+  <div class="author__container">
+    <%= render :avatar %>
+
+    <div>
+      <%= render :name %>
+      <span class="text-md"><%= model.nickname %></span>
+    </div>
+  </div>
+
+  <% if model.public? %>
+    <div class="author__tooltip-links">
+      <%= link_to decidim.profile_followers_path(raw_model.nickname) do %>
+        <%= content_tag(:span, model.followers_count, id: dom_id(raw_model, :followers_count)) %> <%= t("decidim.profiles.show.followers") %>
+      <% end %>
+      <% if model.can_follow? %>
+        <%= link_to decidim.profile_following_path(raw_model.nickname) do %>
+          <%= model.following_count %> <%= t("decidim.profiles.show.following") %>
+        <% end %>
+      <% end %>
+    </div>
+  <% end %>
+
+  <% if model.direct_messages_enabled?(context) %>
+    <%= link_to current_or_new_conversation_path_with(model), class: "button button__sm button__transparent" do %>
+      <span><%= t("decidim.profiles.show.send_private_message") %></span>
+      <%= icon "mail-send-line" %>
+    <% end %>
+  <% end %>
+
+  <%= follow_button_for(raw_model, false, button_classes: "button button__sm button__transparent") %>
+</div>
diff --git a/app/cells/decidim/comments/comment/show.erb b/app/cells/decidim/comments/comment/show.erb
deleted file mode 100644
index c19083d..0000000
--- a/app/cells/decidim/comments/comment/show.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-<%= content_tag :div, id: "comment_#{model.id}", class: comment_classes, data: { comment_id: model.id } do %>
-  <% if model.hidden? %>
-    <%= render :moderation_data %>
-  <% elsif model.deleted? %>
-    <%= render :deletion_data %>
-  <% else %>
-    <div class="comment__header">
-      <% if model.user_group && model.user_group.public? || model.author && model.author.public? %>
-        <div class="author-data">
-          <div class="author-data__main">
-            <%= render :author %>
-            <span>
-              <%= time_tag created_at, l(created_at, format: :decidim_short) %>
-            </span>
-            <% if edited? %>
-              <div class="author-data__extra">
-                <span class="comment__edited">
-                  <%= t("decidim.components.comment.edited") %>
-                </span>
-              </div>
-            <% end %>
-          </div>
-        </div>
-      <% else %>
-        <span>
-          <%= time_tag created_at, l(created_at, format: :decidim_short) %>
-        </span>
-        <% if edited? %>
-          <div class="author-data__extra">
-            <span class="comment__edited">
-              <%= t("decidim.components.comment.edited") %>
-            </span>
-          </div>
-        <% end %>
-      <% end%>
-      <%= render :utilities %>
-    </div>
-    <div class="comment__content">
-      <%= alignment_badge %>
-      <%= comment_body %>
-    </div>
-    <div class="comment__footer">
-      <%= render :actions %>
-      <%= votes %>
-    </div>
-  <% end %>
-  <div id="comment-<%= model.id %>-replies">
-    <% if has_replies_in_children? %>
-      <% replies.each do |reply| %>
-        <%= cell("decidim/comments/comment", reply, root_depth: root_depth, order: order, reloaded: reloaded?) %>
-      <% end %>
-    <% end %>
-  </div>
-  <% if can_reply? %>
-    <div class="comment__additionalreply<%= " hide" unless commentable? %>">
-      <button class="comment__reply muted-link" aria-controls="<%= reply_id %>" data-toggle="<%= reply_id %>">
-        <%= icon "pencil", class: "icon--small", role: "img", "aria-hidden": true %>&nbsp;<%= t("decidim.components.comment.reply") %>
-      </button>
-    </div>
-    <div class="add-comment hide" id="<%= reply_id %>" data-toggler=".hide">
-      <%== cell("decidim/comments/comment_form", model, root_depth: root_depth, order: order) %>
-    </div>
-  <% end %>
-<% end %>
diff --git a/app/cells/decidim/privacy/publish_account_modal/show.erb b/app/cells/decidim/privacy/publish_account_modal/show.erb
index a44188c..c9005df 100644
--- a/app/cells/decidim/privacy/publish_account_modal/show.erb
+++ b/app/cells/decidim/privacy/publish_account_modal/show.erb
@@ -1,13 +1,13 @@
-<div class="reveal" id="publishAccountModal" data-reveal role="dialog" aria-modal="true" aria-labelledby="privacy-modal-label">
-  <div class="reveal__header">
-    <h2 id="privacy-consent-label" class="reveal__title"><%= t("make_profile_public", scope:"decidim.privacy.partials.privacy_consent") %></h2>
+<%= decidim_modal id: "publish-account-modal" do %>
+  <div data-dialog-container>
+    <h2 id="privacy-consent-label"><%= t("make_profile_public", scope:"decidim.privacy.partials.privacy_consent") %></h2>
     <button class="close-button" data-close aria-label="<%= t("close_modal", scope: "decidim.privacy.partials.privacy_consent") %>"
       type="button">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
   <div class="row columns">
-     <%= t("content_html", scope:"decidim.privacy.partials.privacy_consent") %>
+      <%= t("content_html", scope:"decidim.privacy.partials.privacy_consent") %>
   </div>
   <div class="row">
     <div class="columns medium-12">
@@ -26,4 +26,4 @@
       <% end %>
     </div>
   </div>
-</div>
+<% end %>
diff --git a/app/packs/src/decidim/privacy/decidim_privacy_settings.js b/app/packs/src/decidim/privacy/decidim_privacy_settings.js
index 693cbf3..6895d7f 100644
--- a/app/packs/src/decidim/privacy/decidim_privacy_settings.js
+++ b/app/packs/src/decidim/privacy/decidim_privacy_settings.js
@@ -5,17 +5,14 @@ $(() => {
   if (accountPublicity && accountPublicity.dataset.publicity === "true") {
     privacyMessagingText.style.display = "block";
   } else {
-    console.log(accountPublicity.dataset)
     privacyMessagingText.style.display = "none";
   }
 
   const toggleVisibility = () => {
     if (privacyMessagingText.style.display === "none"){
       privacyMessagingText.style.display = "block";
-      console.log("NÄYTÄ")
     } else {
       privacyMessagingText.style.display = "none";
-      console.log("PIILOTA")
     }
   };
 
diff --git a/app/presenters/concerns/decidim/privacy/user_presenter_extensions.rb b/app/presenters/concerns/decidim/privacy/user_presenter_extensions.rb
index 9e862f3..1d4f2ee 100644
--- a/app/presenters/concerns/decidim/privacy/user_presenter_extensions.rb
+++ b/app/presenters/concerns/decidim/privacy/user_presenter_extensions.rb
@@ -24,14 +24,6 @@ def profile_url
           decidim.profile_url(__getobj__.nickname)
         end
 
-        def avatar_url(variant = nil)
-          return default_avatar_url if __getobj__.blocked?
-          return default_avatar_url unless avatar.attached?
-          return default_avatar_url unless public_user?
-
-          avatar.url(variant: variant)
-        end
-
         def profile_path
           return "" unless public_user?
           return "" if respond_to?(:deleted?) && deleted?
diff --git a/app/views/decidim/messaging/conversations/_conversation.html.erb b/app/views/decidim/messaging/conversations/_conversation.html.erb
deleted file mode 100644
index abd553a..0000000
--- a/app/views/decidim/messaging/conversations/_conversation.html.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-<% nickname ||= false %>
-<% conversation_path = nickname ? decidim.profile_conversation_path(conversation, nickname:) : decidim.conversation_path(conversation) %>
-
-<%= link_to conversation_path, id: "conversation-#{conversation.id}", class: "conversation__item" do %>
-  <div class="conversation__item-avatar">
-    <% if conversation.interlocutors(current_user).count == 1 %>
-      <% if !conversation.interlocutors(current_user).first.public? %>
-        <%= image_tag present(conversation.interlocutors(current_user).first).default_avatar_url, alt: t("decidim.profile.private"), name: t("decidim.profile.private") %>
-      <% else %>
-        <%= cell "decidim/author", present(conversation.interlocutors(current_user).first), layout: :avatar, skip_profile_link: true %>
-      <% end %>
-    <% else %>
-      <%= icon "group-line", class: "w-4 h-4 text-gray fill-current" %>
-    <% end %>
-  </div>
-
-  <div class="conversation__item-snippet">
-    <div class="conversation__item-snippet-title" data-interlocutors-list>
-      <h2 class="h5 text-secondary">
-        <%= conversation.interlocutors(current_user).last.name %>
-      </h2>
-
-      <% if conversation.interlocutors(current_user).count > 1 %>
-        <div class="flex -space-x-2">
-          <% conversation.interlocutors(current_user).each do |interlocutor| %>
-            <span class="rounded-full border border-white inline-block w-6 h-6">
-              <%= cell "decidim/author", present(interlocutor), layout: :avatar, skip_profile_link: true %>
-            </span>
-          <% end %>
-        </div>
-      <% end %>
-    </div>
-
-    <p class="conversation__item-snippet-message"><%= truncate conversation.last_message.body, length: 150 %></p>
-
-    <div class="conversation__item-snippet-time">
-      <%= t("decidim.user_conversations.index.time_ago", time: time_ago_in_words(Time.zone.parse(conversation.last_message.created_at.to_s))) %>
-    </div>
-  </div>
-
-  <div class="conversation__item-unread">
-    <% if conversation.unread_count(current_user).positive? %>
-      <span><%= conversation.unread_count(current_user) %></span>
-    <% end %>
-  </div>
-<% end %>
diff --git a/app/views/decidim/messaging/conversations/_messages.html.erb b/app/views/decidim/messaging/conversations/_messages.html.erb
deleted file mode 100644
index d2dde0e..0000000
--- a/app/views/decidim/messaging/conversations/_messages.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="conversation-chat<%= " conversation-chat--offset" if sender_is_user?(sender) %>">
-  <% if sender.deleted? %>
-    <span class="label label--small label--basic">
-      <%= t("deleted", scope: "decidim.profile") %>
-    </span>
-  <% elsif !sender.public? %>
-      <%= image_tag present(sender).default_avatar_url, alt: t("decidim.profile.private"), name: t("decidim.profile.private") %>
-  <% else %>
-    <%= link_to profile_path(sender.nickname) do %>
-      <%= image_tag present(sender).avatar_url, alt: t("decidim.author.avatar", name: decidim_sanitize(sender.name)) %>
-    <% end %>
-  <% end %>
-  <div>
-    <% messages.each do |message| %>
-      <div class="card">
-        <div class="p-s">
-          <%= simple_format(message.body_with_links) %>
-        </div>
-      </div>
-    <% end %>
-    <span class="text-small<%= " pull-right" if sender_is_user?(sender) %>" title="<%= messages.last.created_at.strftime("%d-%m-%Y %H:%M:%S%z") %>"><%= messages.last.friendly_created_at %></span>
-  </div>
-</div>
diff --git a/app/views/decidim/messaging/conversations/_show.html.erb b/app/views/decidim/messaging/conversations/_show.html.erb
deleted file mode 100644
index 4269332..0000000
--- a/app/views/decidim/messaging/conversations/_show.html.erb
+++ /dev/null
@@ -1,47 +0,0 @@
-<div class="wrapper">
-  <div class="row">
-    <div class="columns medium-9 medium-centered tabs-panel is-active" id="conversations" role="tabpanel" aria-label="<%= strip_tags(conversation_label_for(participants)) %>">
-      <div class="conversation">
-
-        <div class="conversation-header flex--cc absolutes">
-          <div class="left center mr-s">
-            <%= link_to decidim.conversations_path, class: "card--list__data__icon card--list__data__icon--back" do %>
-              <%= icon "chevron-left", role: "img", aria_label: t(".back") %>
-            <% end %>
-          </div>
-
-          <% if participants.count == 1 %>
-            <% if participants.first.deleted? %>
-              <%= image_tag present(participants.first).avatar_url, alt: t("decidim.author.avatar", name: t("decidim.profile.deleted")) %>
-            <% elsif !participants.first.public? %>
-              <%= image_tag present(participants.first).default_avatar_url, alt: t("decidim.author.avatar", name: t("decidim.profile.private")) %>
-            <% else %>
-              <%= link_to profile_path(participants.first.nickname) do %>
-                <%= image_tag present(participants.first).avatar_url, alt: t("decidim.author.avatar", name: decidim_sanitize(participants.first.name)) %>
-              <% end %>
-            <% end %>
-          <% else %>
-            <%= image_tag present(current_user).avatar.default_multiuser_url, alt: t("decidim.author.avatar_multiuser") %>
-          <% end %>
-          <div class="ml-s">
-            <h1>
-              <% if participants.count == 1 %>
-                <%= t(".chat_with") %> <%= conversation_name_for(participants) %>
-              <% else %>
-                <%= t(".title", usernames: username_list(participants)).html_safe %>
-              <% end %>
-            </h1>
-            <% if participants.select { |participant| participant.instance_of?(Decidim::User) && participant.public? }.any?(&:private_messaging_disabled?) %>
-              <% public_participants = participants.select { |participant| participant.instance_of?(Decidim::User) && participant.public? && participant.private_messaging_disabled?} %>
-              <%= t(".private_messaging_disabled_users", count: public_participants.count) %>
-              <%= public_participants.map(&:name).join(", ") %>
-            <% end %>
-          </div>
-        </div>
-
-        <%= yield %>
-
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/app/views/decidim/messaging/conversations/new.html.erb b/app/views/decidim/messaging/conversations/new.html.erb
deleted file mode 100644
index 40d3714..0000000
--- a/app/views/decidim/messaging/conversations/new.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<%= render layout: "show", locals: { participants: @form.recipient.to_a } do %>
-  <div id="messages"></div>
-  <% if @form.recipient.to_a.select { |recipient| recipient.instance_of?(Decidim::User) }.any?(&:private_messaging_disabled?) %>
-    <% if @form.recipient.count > 1 %>
-      <div class="callout warning margin-top-2"><%= t(".private_messaging_disabled_new_multiple") %></div>
-    <% else %>
-      <div class="callout warning margin-top-2"><%= t(".private_messaging_disabled_new") %></div>
-    <% end %>
-  <% else %>
-    <%= render "start", form: @form %>
-  <% end %>
-<% end %>
diff --git a/app/views/decidim/messaging/conversations/show.html.erb b/app/views/decidim/messaging/conversations/show.html.erb
deleted file mode 100644
index dbe5d28..0000000
--- a/app/views/decidim/messaging/conversations/show.html.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<%= render layout: "show", locals: { participants: conversation.interlocutors(current_user) } do %>
-  <div id="messages" class="scroll-to-last-message">
-    <% user_grouped_messages.each do |sender, messages| %>
-        <%= render "messages", sender: sender, messages: messages %>
-    <% end %>
-  </div>
-  <% if conversation.with_deleted_users?(current_user) %>
-    <div class="callout warning margin-top-2"><%= t ".deleted_accounts" %></div>
-  <% elsif conversation.interlocutors(current_user).count == 1 &&
-  conversation.interlocutors(current_user).first.instance_of?(Decidim::User) &&
-  !conversation.interlocutors(current_user).first.public?
-  %>
-    <div class="callout warning margin-top-2"><%= t(".private_account") %></div>
-  <% elsif conversation.interlocutors(current_user).count == 1 &&
-  conversation.interlocutors(current_user).first.instance_of?(Decidim::User) &&
-  conversation.interlocutors(current_user).first.private_messaging_disabled?
-  %>
-    <div class="callout warning margin-top-2"><%= t(".private_messaging_disabled") %></div>
-  <% elsif conversation.accept_user?(current_user) %>
-    <%= render "reply", form: @form, conversation: conversation %>
-  <% else %>
-    <div class="callout warning margin-top-2"><%= t ".not_allowed" %></div>
-  <% end %>
-<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 74f7974..cdb730b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -13,6 +13,8 @@ en:
         profile: My public profile
         message: "Your profile is set as public on this platform and other people can see details about you, such as your name, nickname, profile picture and your public activity on this platform. You can change the visibility of your profile through the privacy settings page. Your profile is available at:"
       shared:
+        layout_two_col:
+          private_account: Private account
         layout_center:
           save_privacy_settings: Save privacy settings
   decidim:
diff --git a/lib/decidim/privacy/engine.rb b/lib/decidim/privacy/engine.rb
index f12f61e..de95064 100644
--- a/lib/decidim/privacy/engine.rb
+++ b/lib/decidim/privacy/engine.rb
@@ -52,7 +52,7 @@ class Engine < ::Rails::Engine
         end
       end
 
-      initializer "decidim_privacy.add_cells_view_paths", before: "decidim_comments.add_cells_view_paths" do
+      initializer "decidim_privacy.add_cells_view_paths", before: "decidim_core.add_cells_view_paths" do
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Privacy::Engine.root}/app/cells")
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Privacy::Engine.root}/app/views")
       end