diff --git a/app/views/admin/spending_proposals/_spending_proposal_data_written_by_valuators.html.erb b/app/views/admin/spending_proposals/_spending_proposal_data_written_by_valuators.html.erb
deleted file mode 100644
index e231d1d23..000000000
--- a/app/views/admin/spending_proposals/_spending_proposal_data_written_by_valuators.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<h2><%= t("admin.spending_proposals.show.dossier") %></h2>
-
-<p><strong><%= t("admin.spending_proposals.show.price") %> (<%= t("admin.spending_proposals.show.currency") %>):</strong>
-  <%= @spending_proposal.price.present? ? @spending_proposal.price : t("admin.spending_proposals.show.undefined") %>
-</p>
-<p><strong><%= t("admin.spending_proposals.show.price_first_year") %> (<%= t("admin.spending_proposals.show.currency") %>):</strong>
-  <%= @spending_proposal.price_first_year.present? ? @spending_proposal.price_first_year : t("admin.spending_proposals.show.undefined") %>
-</p>
-<%= simple_format(safe_html_with_links(@spending_proposal.price_explanation.html_safe), {}, sanitize: false) if @spending_proposal.price_explanation.present? %>
-
-<p><strong><%= t("admin.spending_proposals.show.feasibility") %>:</strong>
-  <%= t("admin.spending_proposals.show.#{@spending_proposal.feasibility}") %>
-</p>
-<%= simple_format(safe_html_with_links(@spending_proposal.feasible_explanation.html_safe), {}, sanitize: false) if @spending_proposal.feasible_explanation.present? %>
-
-<% if @spending_proposal.valuation_finished %>
-  <p><strong><%= t("admin.spending_proposals.show.valuation_finished") %></strong>
-<% end %>
-
-<% if @spending_proposal.internal_comments.present? %>
-  <h2><%= t("admin.spending_proposals.show.internal_comments") %></h2>
-  <%= simple_format(safe_html_with_links(@spending_proposal.internal_comments.html_safe), {}, sanitize: false) %>
-<% end %>
diff --git a/app/views/admin/spending_proposals/_spending_proposal_data_written_by_author.html.erb b/app/views/admin/spending_proposals/_written_by_author.html.erb
similarity index 100%
rename from app/views/admin/spending_proposals/_spending_proposal_data_written_by_author.html.erb
rename to app/views/admin/spending_proposals/_written_by_author.html.erb
diff --git a/app/views/admin/spending_proposals/_written_by_valuators.html.erb b/app/views/admin/spending_proposals/_written_by_valuators.html.erb
new file mode 100644
index 000000000..1361a5dc1
--- /dev/null
+++ b/app/views/admin/spending_proposals/_written_by_valuators.html.erb
@@ -0,0 +1,46 @@
+<h2><%= t("admin.spending_proposals.show.dossier") %></h2>
+
+<p id="price">
+  <strong>
+    <%= t("admin.spending_proposals.show.price") %>
+   (<%= t("admin.spending_proposals.show.currency") %>):
+  </strong>
+  <% if @spending_proposal.price.present? %>
+    <%= @spending_proposal.price %>
+  <% else %>
+   <%= t("admin.spending_proposals.show.undefined") %>
+  <% end %>
+</p>
+
+<p id="price_first_year">
+  <strong>
+    <%= t("admin.spending_proposals.show.price_first_year") %>
+    (<%= t("admin.spending_proposals.show.currency") %>):
+  </strong>
+
+  <% if @spending_proposal.price_first_year.present? %>
+    <%= @spending_proposal.price_first_year %>
+  <% else %>
+   <%= t("admin.spending_proposals.show.undefined") %>
+  <% end %>
+</p>
+
+<%= explanation_field @spending_proposal.price_explanation %>
+
+<p id="feasibility">
+  <strong><%= t("admin.spending_proposals.show.feasibility") %>:</strong>
+  <%= t("admin.spending_proposals.show.#{@spending_proposal.feasibility}") %>
+</p>
+
+<%= explanation_field @spending_proposal.feasible_explanation %>
+
+<% if @spending_proposal.valuation_finished %>
+  <p id="valuation">
+    <strong><%= t("admin.spending_proposals.show.valuation_finished") %></strong>
+  </p>
+<% end %>
+
+<% if @spending_proposal.internal_comments.present? %>
+  <h2><%= t("admin.spending_proposals.show.internal_comments") %></h2>
+  <%= explanation_field @spending_proposal.internal_comments %>
+<% end %>
diff --git a/app/views/admin/spending_proposals/edit.html.erb b/app/views/admin/spending_proposals/edit.html.erb
index 64148f04b..a2e45dd04 100644
--- a/app/views/admin/spending_proposals/edit.html.erb
+++ b/app/views/admin/spending_proposals/edit.html.erb
@@ -2,7 +2,7 @@
   <i class="icon-angle-left"></i> <%= t("admin.spending_proposals.show.back") %>
 <% end %>
 
-<%= render 'admin/spending_proposals/spending_proposal_data_written_by_author' %>
+<%= render 'written_by_author' %>
 
 <h2 id="form"><%= t("admin.spending_proposals.edit.classification") %></h2>
 
@@ -36,6 +36,4 @@
 <% end %>
 
 <hr>
-
-<%= render 'admin/spending_proposals/spending_proposal_data_written_by_valuators' %>
-
+<%= render 'written_by_valuators' %>
\ No newline at end of file
diff --git a/app/views/admin/spending_proposals/show.html.erb b/app/views/admin/spending_proposals/show.html.erb
index 65cf5daf4..7c8e943af 100644
--- a/app/views/admin/spending_proposals/show.html.erb
+++ b/app/views/admin/spending_proposals/show.html.erb
@@ -2,7 +2,7 @@
   <i class="icon-angle-left"></i> <%= t("admin.spending_proposals.show.back") %>
 <% end %>
 
-<%= render 'admin/spending_proposals/spending_proposal_data_written_by_author' %>
+<%= render 'written_by_author' %>
 
 <h2 id="classification"><%= t("admin.spending_proposals.show.classification") %></h2>
 
@@ -30,6 +30,4 @@
 
 <hr>
 
-<%= render 'admin/spending_proposals/spending_proposal_data_written_by_valuators' %>
-
-
+<%= render 'written_by_valuators' %>
\ No newline at end of file
diff --git a/app/views/valuation/spending_proposals/show.html.erb b/app/views/valuation/spending_proposals/show.html.erb
index 16f83dbe4..7abb62452 100644
--- a/app/views/valuation/spending_proposals/show.html.erb
+++ b/app/views/valuation/spending_proposals/show.html.erb
@@ -32,7 +32,7 @@
 
 <p><strong><%= t("valuation.spending_proposals.show.assigned_admin") %>:</strong>
   <% if @spending_proposal.administrator.present? %>
-    <%= @spending_proposal.administrator.name %> (<%= @spending_proposal.administrator.email %>)
+    <%= @spending_proposal.administrator.name_and_email %>
   <% else %>
     <%= t("valuation.spending_proposals.show.undefined") %></li>
   <% end %>
@@ -42,7 +42,7 @@
 <div id="assigned_valuators">
   <ul>
     <% @spending_proposal.valuators.each do |valuator| %>
-      <li><%= valuator.name %> (<%= valuator.email %>)</li>
+      <li><%= valuator.name_and_email %></li>
     <% end %>
 
     <% if @spending_proposal.valuators.empty? %>
@@ -58,19 +58,40 @@
 </p>
 
 <p id="price">
-  <strong><%= t("valuation.spending_proposals.show.price") %> (<%= t("valuation.spending_proposals.show.currency") %>):</strong>
-  <%= @spending_proposal.price.presence or t("valuation.spending_proposals.show.undefined") %>
+  <strong>
+    <%= t("valuation.spending_proposals.show.price") %>
+    (<%= t("valuation.spending_proposals.show.currency") %>):
+  </strong>
+
+  <% if @spending_proposal.price.present? %>
+    <%= @spending_proposal.price %>
+  <% else %>
+    <% t("valuation.spending_proposals.show.undefined") %>
+  <% end %>
 </p>
+
 <p id="price_first_year">
-  <strong><%= t("valuation.spending_proposals.show.price_first_year") %> (<%= t("valuation.spending_proposals.show.currency") %>):</strong>
-  <%= @spending_proposal.price_first_year.presence or t("valuation.spending_proposals.show.undefined") %>
+  <strong>
+    <%= t("valuation.spending_proposals.show.price_first_year") %>
+    (<%= t("valuation.spending_proposals.show.currency") %>):
+  </strong>
+
+  <% if @spending_proposal.price_first_year.present? %>
+   <%= @spending_proposal.price_first_year %>
+  <% else %>
+   <%= t("valuation.spending_proposals.show.undefined") %>
+  <% end %>
 </p>
 
 <%= explanation_field @spending_proposal.price_explanation %>
 
 <p id="time_scope">
   <strong><%= t("valuation.spending_proposals.show.time_scope") %>:</strong>
-  <%= @spending_proposal.time_scope.presence or  t("valuation.spending_proposals.show.undefined") %>
+  <% if @spending_proposal.time_scope.present? %>
+    <%= @spending_proposal.time_scope %>
+  <% else %>
+    <%= t("valuation.spending_proposals.show.undefined") %>
+  <% end %>
 </p>
 
 <p id="feasibility">
@@ -81,12 +102,12 @@
 <%= explanation_field @spending_proposal.feasible_explanation %>
 
 <% if @spending_proposal.valuation_finished %>
-  <p>
+  <p id="finished">
     <strong><%= t("valuation.spending_proposals.show.valuation_finished") %></strong>
   </p>
 <% end %>
 
 <% if @spending_proposal.internal_comments.present? %>
   <h2><%= t("valuation.spending_proposals.show.internal_comments") %></h2>
-  <%= simple_format_no_tags_no_sanitize(safe_html_with_links(@spending_proposal.internal_comments.html_safe)) %>
+  <%= explanation_field @spending_proposal.internal_comments %>
 <% end %>