-<% @title = t(".title", :name => h(@user.display_name)) %>
+<% @title = t(".title", :name => @user.display_name) %>
+
+<% content_for :heading_class, "pb-0" %>
<% content_for :heading do %>
- <h1><%= raw(t(".heading", :name => link_to(h(@user.display_name), user_path(@user)))) %></h1>
+ <h1><%= t(".heading_html", :name => link_to(@user.display_name, @user)) %></h1>
+ <%= render :partial => "navigation" %>
<% end %>
<% unless @user_blocks.empty? %>
-<%= render :partial => "blocks", :locals => { :show_revoke_link => (current_user && current_user.moderator?), :show_user_name => true, :show_creator_name => false } %>
+<%= render :partial => "page" %>
<% else %>
-<p><%= t ".empty", :name => h(@user.display_name) %></p>
+<p><%= t ".empty", :name => @user.display_name %></p>
<% end %>