diff --git a/app/assets/stylesheets/custom/tenants.scss b/app/assets/stylesheets/custom/tenants.scss
index 95de280dd57..0ce5d62d203 100644
--- a/app/assets/stylesheets/custom/tenants.scss
+++ b/app/assets/stylesheets/custom/tenants.scss
@@ -51,9 +51,9 @@
   --main-header: var(--brand);
   --brand-contrast: #FFFFFF;
   --main-header-contrast: #FFFFFF;
-   // Import shared styles
-   @import "cosla_shared";
-   @include shared-styles;
+  // Import shared styles
+  @import "cosla_shared";
+  @include shared-styles;
 }
 
 .tenant-flotta {
@@ -67,23 +67,23 @@
   --main-header: var(--brand);
   --brand-contrast: #FFFFFF;
   --main-header-contrast: #FFFFFF;
-   // Import shared styles
-   @import "cosla_shared";
-   @include shared-styles;
+  // Import shared styles
+  @import "cosla_shared";
+  @include shared-styles;
 }
 
 .tenant-test {
-   --anchor-color: #008585;
-   --anchor-color-hover: #74a892;
-   --brand: #c7522a;
-   --brand-secondary: #e5c185;
-   --button-background-hover: #fbf2c4;
-   --button-background-hover-contrast: #{$black};
-   --footer: #e6e6e6;
-   --main-header: #74a892;
-   --top-links: var(--main-header);
-   --subnavigation: #c7522a;
- }
+  --anchor-color: #008585;
+  --anchor-color-hover: #74a892;
+  --brand: #c7522a;
+  --brand-secondary: #e5c185;
+  --button-background-hover: #fbf2c4;
+  --button-background-hover-contrast: #{$black};
+  --footer: #e6e6e6;
+  --main-header: #74a892;
+  --top-links: var(--main-header);
+  --subnavigation: #c7522a;
+}
 
 .tenant-arb {
   --brand: #10069F;
@@ -92,56 +92,56 @@
   --footer: #023C19;
   --footer-contrast: #FFFFFF;
   --main-header-contrast: #FFFFFF;
-   --top-links: var(--brand-secondary);
+  --top-links: var(--brand-secondary);
   --top-links-contrast: #FFFFFF;
   @import "cosla_shared";
-   @include shared-styles;
+  @include shared-styles;
 }
 
- .tenant-inverc {
+.tenant-inverc {
   --brand: #36808c;
   --brand-secondary: #75a5ad;
   --brand-contrast: #FFFFFF;
   --footer: #d7e5e7;
   --main-header-contrast: #FFFFFF;
-   --top-links: #75a5ad ;
+  --top-links: #75a5ad;
   --top-links-contrast: #FFFFFF;
-   @import "cosla_shared";
-   @include shared-styles;
+  @import "cosla_shared";
+  @include shared-styles;
 }
 
 .tenant-edi {
-  --brand:     #6D3465;
+  --brand: #6D3465;
   --brand-secondary: #492445;
   --brand-contrast: #FFFFFF;
   --footer: #D0E0F4;
   --main-header-contrast: #FFFFFF;
-   --top-links: var(--brand-secondary);
+  --top-links: var(--brand-secondary);
   --top-links-contrast: #FFFFFF;
   @import "cosla_shared";
-   @include shared-styles;
+  @include shared-styles;
 }
 
 .tenant-aberdeen {
-    --main-header: #EF5D9E;
-    --brand: #45D3A1;
-    --brand-secondary: #6CBEEC;
-    --brand-contrast: #FF;
-    --footer: #eee6db;
-    --main-header-contrast: #FFFFFF;
-    --top-links: #eee6db;
-    --top-links-contrast: #FF;
+  --main-header: #EF5D9E;
+  --brand: #45D3A1;
+  --brand-secondary: #6CBEEC;
+  --brand-contrast: #FF;
+  --footer: #eee6db;
+  --main-header-contrast: #FFFFFF;
+  --top-links: #eee6db;
+  --top-links-contrast: #FF;
 }
 
 .tenant-sac {
-  --brand:     #005293;
+  --brand: #005293;
   --brand-secondary: #002F59;
   --footer: #CEDBEA;
   --brand-contrast: #FFFFFF;
   --main-header-contrast: #FFFFFF;
   --top-links: var(--brand-secondary);
   --top-links-contrast: #FFFFFF;
-  @import "cosla_shared"; 
+  @import "cosla_shared";
   @include shared-styles;
 }
 
@@ -152,10 +152,10 @@
   --footer: #023C19;
   --footer-contrast: #FFFFFF;
   --main-header-contrast: #FFFFFF;
-   --top-links: var(--brand-secondary);
+  --top-links: var(--brand-secondary);
   --top-links-contrast: #FFFFFF;
   @import "cosla_shared";
-   @include shared-styles;
+  @include shared-styles;
 }
 
 .tenant-highland {
@@ -169,9 +169,9 @@
   --main-header: var(--brand);
   --brand-contrast: #FFFFFF;
   --main-header-contrast: #FFFFFF;
-   // Import shared styles
-   @import "cosla_shared";
-   @include shared-styles;
+  // Import shared styles
+  @import "cosla_shared";
+  @include shared-styles;
 }
 
 .tenant-hlc {
@@ -185,7 +185,7 @@
   --main-header: var(--brand);
   --brand-contrast: #FFFFFF;
   --main-header-contrast: #FFFFFF;
-   // Import shared styles
-   @import "cosla_shared";
-   @include shared-styles;
+  // Import shared styles
+  @import "cosla_shared";
+  @include shared-styles;
 }
diff --git a/app/views/admin/postcodes/_form.html.erb b/app/views/admin/postcodes/_form.html.erb
index 9fd5e61c34f..6577d12feb4 100644
--- a/app/views/admin/postcodes/_form.html.erb
+++ b/app/views/admin/postcodes/_form.html.erb
@@ -12,12 +12,12 @@
     </div>
 
     <div class="small-12 medium-6 large-4 column end">
-      <%= f.collection_select :geozone_id, Geozone.all, :id, :name, prompt:true, hint: t("admin.postcodes.postcode.geozone_help") %>
+      <%= f.collection_select :geozone_id, Geozone.all, :id, :name, prompt: true, hint: t("admin.postcodes.postcode.geozone_help") %>
     </div>
   </div>
 
   <div class="small-12 column">
     <%= f.submit(value: t("admin.postcodes.edit.form.submit_button"),
-                class: "button success") %>
+                 class: "button success") %>
   </div>
 <% end %>
diff --git a/app/views/admin/postcodes/ncsv_review.html.erb b/app/views/admin/postcodes/ncsv_review.html.erb
index 714a09226a4..fe97d7a8aa7 100644
--- a/app/views/admin/postcodes/ncsv_review.html.erb
+++ b/app/views/admin/postcodes/ncsv_review.html.erb
@@ -11,27 +11,27 @@
 <br>
 <table>
   <thead>
-    <tr>
-      <th><%= t("admin.postcodes.postcode.postcode") %></th>
-      <th><%= t("admin.postcodes.postcode.ward") %></th>
-      <th><%= t("admin.postcodes.postcode.geozone_id") %></th>
-    </tr>
+  <tr>
+    <th><%= t("admin.postcodes.postcode.postcode") %></th>
+    <th><%= t("admin.postcodes.postcode.ward") %></th>
+    <th><%= t("admin.postcodes.postcode.geozone_id") %></th>
+  </tr>
   </thead>
 
   <tbody>
-    <% if @rejected_entries.length == 0 %>
+  <% if @rejected_entries.length == 0 %>
+    <tr>
+      <td><%= t("admin.postcodes.index.no_record") %></td>
+    </tr>
+  <% else %>
+    <% @rejected_entries.each do |rejected_entry| %>
       <tr>
-        <td><%= t("admin.postcodes.index.no_record") %></td>
+        <% rejected_entry.each do |key, value| %>
+          <td><%= value %></td>
+        <% end %>
       </tr>
-    <% else %>
-      <% @rejected_entries.each do |rejected_entry| %>
-        <tr>
-          <% rejected_entry.each do |key, value| %>
-            <td><%= value %></td>
-          <% end %>
-        </tr>
-      <% end %>
     <% end %>
+  <% end %>
   </tbody>
 </table>
 
@@ -39,11 +39,11 @@
 
 <table>
   <thead>
-    <tr>
-      <th><%= t("admin.postcodes.postcode.postcode") %></th>
-      <th><%= t("admin.postcodes.postcode.ward") %></th>
-      <th><%= t("admin.postcodes.postcode.geozone_id") %></th>
-    </tr>
+  <tr>
+    <th><%= t("admin.postcodes.postcode.postcode") %></th>
+    <th><%= t("admin.postcodes.postcode.ward") %></th>
+    <th><%= t("admin.postcodes.postcode.geozone_id") %></th>
+  </tr>
   </thead>
 
   <tbody>
@@ -61,4 +61,4 @@
     <% end %>
   <% end %>
   </tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/app/views/budgets/results/_results_table.html.erb b/app/views/budgets/results/_results_table.html.erb
index 770266baab2..68ed28a6a1f 100644
--- a/app/views/budgets/results/_results_table.html.erb
+++ b/app/views/budgets/results/_results_table.html.erb
@@ -6,76 +6,76 @@
 
   <table id="budget-investments-<%= results_type %>" class="table-for-mobile">
     <thead>
-      <tr>
-        <th scope="col">
-          <%= t("budgets.results.investment_title") %>
-        </th>
+    <tr>
+      <th scope="col">
+        <%= t("budgets.results.investment_title") %>
+      </th>
+      <th scope="col" class="text-center">
+        <%= t("budgets.results.ballot_lines_count") %>
+      </th>
+      <% if @budget.show_money? %>
         <th scope="col" class="text-center">
-          <%= t("budgets.results.ballot_lines_count") %>
+          <%= t("budgets.results.price") %>
         </th>
-        <% if @budget.show_money? %>
-          <th scope="col" class="text-center">
-            <%= t("budgets.results.price") %>
+        <% if results_type == :compatible %>
+          <th scope="col" class="text-right">
+            <small><%= t("budgets.results.amount_available") %></small><br>
+            <%= @budget.formatted_amount(heading_price) %><br>
           </th>
-          <% if results_type == :compatible %>
-            <th scope="col" class="text-right">
-              <small><%= t("budgets.results.amount_available") %></small><br>
-              <%= @budget.formatted_amount(heading_price) %><br>
-            </th>
-          <% end %>
         <% end %>
-      </tr>
+      <% end %>
+    </tr>
     </thead>
 
     <tbody>
-      <% amount_available = heading_price %>
-      <% investments.each do |investment| %>
-          <tr id="<%= dom_id(investment) %>"
-              class="budget-investments <%= investment.winner? ? "success" : "js-discarded" %>"
-              style="<%= investment.winner? ? "" : "display: none" %>">
-            <td>
-            <% if investment.winner? %>
+    <% amount_available = heading_price %>
+    <% investments.each do |investment| %>
+      <tr id="<%= dom_id(investment) %>"
+          class="budget-investments <%= investment.winner? ? "success" : "js-discarded" %>"
+          style="<%= investment.winner? ? "" : "display: none" %>">
+        <td>
+          <% if investment.winner? %>
                <span class="icon-check" style="color: <%= @budget.part_fund && investment.winner && amount_available - investment.price < 0 ? 'orange' : '' %>">
                  <span class="show-for-sr">
                    <%= t("budgets.results.accepted") %>
                  </span>
                </span>
-              <% else %>
+          <% else %>
                 <span class="icon-x delete">
                   <span class="show-for-sr">
                     <%= t("budgets.results.discarded") %>
                   </span>
                 </span>
-              <% end %>
-              <%= link_to investment.title, budget_investment_path(@budget, investment) %>
-            </td>
-            <td class="text-center">
-              <%= investment.ballot_lines_count %>
-            </td>
-            <% if @budget.show_money? %>
-  	    <td class="text-center" >
-    	      <% if @budget.part_fund && investment.winner && amount_available - investment.price < 0 %>
-       	      <%= @budget.formatted_amount(investment.price) %>(Part Fund)
-	    <% else %>
-  	      <%= @budget.formatted_amount(investment.price) %>
-	    <% end %>
-            </td>
-            <% if results_type == :compatible %>
-              <% if @budget.part_fund && investment.winner && amount_available - investment.price < 0 %>
-                <% amount_after_investment = amount_available - investment.price %>
-                <td class="small text-right" title="<%= @budget.formatted_amount(amount_available) %> - <%= @budget.formatted_amount(investment.price) %>">
-                  <%= @budget.formatted_amount(amount_after_investment) %>
-                </td>
-              <% else %>
-                <td class="small text-right" title="<%= @budget.formatted_amount(amount_available) %> - <%= @budget.formatted_amount(investment.price) %> ">
-                  <%= @budget.formatted_amount(amount_available - investment.price) %>
-                  <% amount_available -= investment.price if investment.winner? %>
-                </td>
-              <% end %>
+          <% end %>
+          <%= link_to investment.title, budget_investment_path(@budget, investment) %>
+        </td>
+        <td class="text-center">
+          <%= investment.ballot_lines_count %>
+        </td>
+        <% if @budget.show_money? %>
+          <td class="text-center">
+            <% if @budget.part_fund && investment.winner && amount_available - investment.price < 0 %>
+              <%= @budget.formatted_amount(investment.price) %>(Part Fund)
+            <% else %>
+              <%= @budget.formatted_amount(investment.price) %>
             <% end %>
-           <% end %>
-        </tr>
-      <% end %>
+          </td>
+          <% if results_type == :compatible %>
+            <% if @budget.part_fund && investment.winner && amount_available - investment.price < 0 %>
+              <% amount_after_investment = amount_available - investment.price %>
+              <td class="small text-right" title="<%= @budget.formatted_amount(amount_available) %> - <%= @budget.formatted_amount(investment.price) %>">
+                <%= @budget.formatted_amount(amount_after_investment) %>
+              </td>
+            <% else %>
+              <td class="small text-right" title="<%= @budget.formatted_amount(amount_available) %> - <%= @budget.formatted_amount(investment.price) %> ">
+                <%= @budget.formatted_amount(amount_available - investment.price) %>
+                <% amount_available -= investment.price if investment.winner? %>
+              </td>
+            <% end %>
+          <% end %>
+        <% end %>
+      </tr>
+    <% end %>
     </tbody>
   </table>
 </div>
diff --git a/app/views/budgets/select_headings.html.erb b/app/views/budgets/select_headings.html.erb
index d8bf454f57e..fbc1952facd 100644
--- a/app/views/budgets/select_headings.html.erb
+++ b/app/views/budgets/select_headings.html.erb
@@ -4,7 +4,7 @@
 <p><%= t("budgets.select_headings.budget_name") %>: <%= @budget.name %></p>
 
 <%= form_with url: new_budget_investment_path(@budget.id, proposal_id: @proposal.id), method: :get, local: true do |form| %>
-  <div  class="small-12 medium-6 column">
+  <div class="small-12 medium-6 column">
     <%= form.label :group_id, t("budgets.select_headings.select_group") %>
     <%= form.collection_select :group_id, @groups, :id, :name, { prompt: t("budgets.select_headings.choose_group") }, { id: "group-select" } %>
 
@@ -15,14 +15,14 @@
   <%= form.hidden_field :proposal_id, value: @proposal.id %>
   <%= form.hidden_field :budget_id, value: @budget.id %>
   <div class="small-12 column">
-  <div class="button success">
-    <%= form.submit t("budgets.select_headings.submit") %>
-  </div>
+    <div class="button success">
+      <%= form.submit t("budgets.select_headings.submit") %>
+    </div>
   </div>
 <% end %>
 
 <script>
-  document.addEventListener("DOMContentLoaded", function() {
+  document.addEventListener("DOMContentLoaded", function () {
     const groupSelect = document.getElementById("group-select");
     const headingSelect = document.getElementById("heading-select");
 
@@ -31,7 +31,7 @@
       return;
     }
 
-    groupSelect.addEventListener("change", function() {
+    groupSelect.addEventListener("change", function () {
       const groupId = this.value;
 
       if (groupId) {
diff --git a/app/views/custom/budgets/investments/_investment_detail.html.erb b/app/views/custom/budgets/investments/_investment_detail.html.erb
index 13a4965c539..3afa9994a77 100644
--- a/app/views/custom/budgets/investments/_investment_detail.html.erb
+++ b/app/views/custom/budgets/investments/_investment_detail.html.erb
@@ -24,22 +24,22 @@
   <%= sanitize(t("budgets.investments.show.code", code: investment.id)) %>
 </p>
 
- <div>
-<% if investment.should_show_estimated_price? %>
-  <h3><%= t("budgets.investments.show.estimated_price") %></h3>
-  <p class="investment-project-amount">
-    <%= investment.formatted_estimated_price %>
-  </p>
-  <hr>
-<% end %>
+<div>
+  <% if investment.should_show_estimated_price? %>
+    <h3><%= t("budgets.investments.show.estimated_price") %></h3>
+    <p class="investment-project-amount">
+      <%= investment.formatted_estimated_price %>
+    </p>
+    <hr>
+  <% end %>
 </div>
 <div>
 
-<h3><%= t("budgets.investments.show.summary") %></h3>
-<%= auto_link_already_sanitized_html wysiwyg(investment.summary) %>
-<hr>
-<h3><%= t("budgets.investments.show.description") %></h3>
-<%= auto_link_already_sanitized_html wysiwyg(investment.description) %>
+  <h3><%= t("budgets.investments.show.summary") %></h3>
+  <%= auto_link_already_sanitized_html wysiwyg(investment.summary) %>
+  <hr>
+  <h3><%= t("budgets.investments.show.description") %></h3>
+  <%= auto_link_already_sanitized_html wysiwyg(investment.description) %>
 </div>
 <hr>
 
diff --git a/app/views/custom/budgets/investments/_investment_show.html.erb b/app/views/custom/budgets/investments/_investment_show.html.erb
index fe390dee94e..8d286089548 100644
--- a/app/views/custom/budgets/investments/_investment_show.html.erb
+++ b/app/views/custom/budgets/investments/_investment_show.html.erb
@@ -1,10 +1,10 @@
 <% provide :social_media_meta_tags do %>
-<%= render "shared/social_media_meta_tags",
-           social_url: budget_investments_path(investment),
-           social_title: investment.title,
-           social_description: investment.description,
-           twitter_image_url: (investment.image.present? ? polymorphic_path(investment.image.variant(:thumb)) : nil),
-           og_image_url: (investment.image.present? ? polymorphic_path(investment.image.variant(:thumb)) : nil) %>
+  <%= render "shared/social_media_meta_tags",
+             social_url: budget_investments_path(investment),
+             social_title: investment.title,
+             social_description: investment.description,
+             twitter_image_url: (investment.image.present? ? polymorphic_path(investment.image.variant(:thumb)) : nil),
+             og_image_url: (investment.image.present? ? polymorphic_path(investment.image.variant(:thumb)) : nil) %>
 <% end %>
 
 <section class="budget-investment-show" id="<%= dom_id(investment) %>">
@@ -83,35 +83,35 @@
         </div>
       <% end %>
       <% if investment.should_show_estimated_price? %>
-         <h3><%= t("budgets.investments.show.estimated_price") %></h3>
+        <h3><%= t("budgets.investments.show.estimated_price") %></h3>
         <p class="investment-project-amount">
-        <%= investment.formatted_estimated_price %> 
-  </p>
-  <hr>
-<% end %>
-       
+          <%= investment.formatted_estimated_price %>
+        </p>
+        <hr>
+      <% end %>
+
 
       <% if investment.should_show_price? %>
         <div class="sidebar-divider"></div>
-          
-           <% if investment.formatted_price.nil? %>
-                <h2><%= t("budgets.investments.show.estimated_price") %></h2>
-               <div class="supports text-center">
-               <p class="investment-project-amount">
-               <%= investment.formatted_estimated_price unless investment.formatted_estimated_price.nil? %>
-               </p>
-               </div>
-           <% else %>
-               <h2><%= t("budgets.investments.show.price") %></h2>
-               <p class="investment-project-amount">
-                <div class="supports text-center">
-
-               <%= investment.formatted_price %>
-             </p>
-             </div>
-           <% end %>
-          
-        
+
+        <% if investment.formatted_price.nil? %>
+          <h2><%= t("budgets.investments.show.estimated_price") %></h2>
+          <div class="supports text-center">
+            <p class="investment-project-amount">
+              <%= investment.formatted_estimated_price unless investment.formatted_estimated_price.nil? %>
+            </p>
+          </div>
+        <% else %>
+          <h2><%= t("budgets.investments.show.price") %></h2>
+          <p class="investment-project-amount">
+          <div class="supports text-center">
+
+            <%= investment.formatted_price %>
+            </p>
+          </div>
+        <% end %>
+
+
         <% if investment.should_show_price_explanation? %>
           <div class="text-center" data-magellan>
             <%= link_to t("budgets.investments.show.see_price_explanation"),
@@ -142,6 +142,6 @@
 
       <%= render "communities/access_button", community: investment.community %>
 
-     </aside>
+    </aside>
   </div>
 </section>
diff --git a/app/views/custom/dashboard/progress.html.erb b/app/views/custom/dashboard/progress.html.erb
index 2597e7b17ed..af458b8dd39 100644
--- a/app/views/custom/dashboard/progress.html.erb
+++ b/app/views/custom/dashboard/progress.html.erb
@@ -39,5 +39,5 @@
 <% end %>
 
 <% if Setting.resources_visible? %>
-<%= render "resources" %>
-<% end %>
\ No newline at end of file
+  <%= render "resources" %>
+<% end %>
diff --git a/app/views/custom/proposals/_proposal.html.erb b/app/views/custom/proposals/_proposal.html.erb
index 2a54cca69cb..752f99f2c32 100644
--- a/app/views/custom/proposals/_proposal.html.erb
+++ b/app/views/custom/proposals/_proposal.html.erb
@@ -1,34 +1,30 @@
-<%
-  # 1. Set a flag based on the variable passed to the partial
-  #    We default to 'false' (the side-by-side style)
-  is_hero_layout = local_assigns.fetch(:layout_style, :default) == :hero
-%>
+<% is_hero_layout = local_assigns.fetch(:layout_style, :default) == :hero %>
 <div id="<%= dom_id(proposal) %>"
-     class="proposal clear <%= ("successful" if proposal.successful?) %>"  data-type="proposal">
-   <div class="panel with-image <%= 'panel--hero' if is_hero_layout %>">  
+     class="proposal clear <%= ("successful" if proposal.successful?) %>" data-type="proposal">
+  <div class="panel with-image <%= 'panel--hero' if is_hero_layout %>">
     <% if proposal.successful? %>
       <div class="icon-successful"></div>
     <% end %>
-    
-   <div class="panel-image">
-    <% if proposal.image.present? %>
+
+    <div class="panel-image">
+      <% if proposal.image.present? %>
         <% if is_hero_layout %>
           <%= image_tag proposal.image.variant(:feed_thumb),
-                          alt: proposal.image.title.unicode_normalize %>
+                        alt: proposal.image.title.unicode_normalize %>
         <% else %>
           <%= image_tag proposal.image.variant(:medium),
-                          alt: proposal.image.title.unicode_normalize %>
+                        alt: proposal.image.title.unicode_normalize %>
         <% end %>
-    <% else %>
+      <% else %>
         <% if is_hero_layout %>
           <%= image_tag proposal.image.variant(:feed_thumb),
-                          alt: proposal.image.title.unicode_normalize %>
+                        alt: proposal.image.title.unicode_normalize %>
         <% else %>
-           <%= image_tag(image_path_for("proposal_background_no_image.png"), alt: proposal.title) %>
+          <%= image_tag(image_path_for("proposal_background_no_image.png"), alt: proposal.title) %>
         <% end %>
 
-    <% end %>
-  </div>
+      <% end %>
+    </div>
 
     <div class="proposal-content">
       <% cache [locale_and_user_status(proposal), "index", proposal, proposal.author] do %>
@@ -78,9 +74,9 @@
           <div class="truncate"></div>
         </div>
         <h4><%= t("budgets.investments.show.estimated_price") %></h4>
-             <p class="investment-project-amount">
-             <%= proposal.price.nil? ? "<em>Not yet known</em>".html_safe : proposal.formatted_price %>
-            </p>
+        <p class="investment-project-amount">
+          <%= proposal.price.nil? ? "<em>Not yet known</em>".html_safe : proposal.formatted_price %>
+        </p>
 
         <%= render "shared/tags", taggable: proposal, limit: 5 %>
       <% end %>
diff --git a/app/views/custom/proposals/show.html.erb b/app/views/custom/proposals/show.html.erb
index 8913382a9bc..f118bbfb336 100644
--- a/app/views/custom/proposals/show.html.erb
+++ b/app/views/custom/proposals/show.html.erb
@@ -1,6 +1,7 @@
 <% provide :title, @proposal.title %>
 <% preview = false unless local_assigns.has_key? :preview %>
-<% content_for :meta_description do %><%= @proposal.summary %><% end %>
+<% content_for :meta_description do %><%= @proposal.summary %>
+<% end %>
 <% provide :social_media_meta_tags do %>
   <%= render "shared/social_media_meta_tags",
              social_url: proposal_url(@proposal),
@@ -63,12 +64,12 @@
                 <span class="icon-edit"></span>
                 <%= t("proposals.show.dashboard_proposal_link") %>
               <% end %>
-               <!-- New Button for copy to Budget Investment -->
-                <%= link_to select_budgets_path(proposal_id: @proposal.id),
-                  class: "button hollow expanded",
-                  id: "budget-investment-link" do %>
-                  <span class="icon-money"></span>
-                  <%= t("proposals.show.budget_investment_link") %>
+              <!-- New Button for copy to Budget Investment -->
+              <%= link_to select_budgets_path(proposal_id: @proposal.id),
+                          class: "button hollow expanded",
+                          id: "budget-investment-link" do %>
+                <span class="icon-money"></span>
+                <%= t("proposals.show.budget_investment_link") %>
               <% end %>
 
             </div>
@@ -92,7 +93,7 @@
   </div>
 <% end %>
 
-<% unless preview || feature?(:hide_comments)%>
+<% unless preview || feature?(:hide_comments) %>
   <div class="additional-content">
     <div class="filter-subnav">
       <div class="row">
@@ -102,7 +103,7 @@
       </div>
     </div>
   </div>
-  
+
   <div class="tabs-content" data-tabs-content="proposals_tabs">
     <div class="tabs-panel is-active" id="tab-comments">
       <%= render "proposals/comments" %>
diff --git a/app/views/custom/users/registrations/new.html.erb b/app/views/custom/users/registrations/new.html.erb
index 41c17f3b3ec..d9d74192bea 100644
--- a/app/views/custom/users/registrations/new.html.erb
+++ b/app/views/custom/users/registrations/new.html.erb
@@ -4,13 +4,13 @@
 <p><em><%= t("omniauth.info.sign_in_help") %></em></p>
 
 
-<div class="accordion-container" >
-   
+<div class="accordion-container">
+
   <div class="accordion-item">
-  <%= link_to t("devise_views.organizations.registrations.new.title"), 
-              new_organization_registration_path, 
-              class: "button expanded" %>
-</div>
+    <%= link_to t("devise_views.organizations.registrations.new.title"),
+                new_organization_registration_path,
+                class: "button expanded" %>
+  </div>
 
   <div class="accordion-item">
 
@@ -20,11 +20,11 @@
             aria-controls="individual-panel"
             data-action="click->accordion#toggle"
             data-accordion-target="trigger">
-      <%= t("devise_views.users.registrations.new.individual_signup") %> 
+      <%= t("devise_views.users.registrations.new.individual_signup") %>
     </button>
 
 
-    <div id="individual-panel" class="accordion-panel" role="region" >
+    <div id="individual-panel" class="accordion-panel" role="region">
 
       <%= render "devise/omniauth_form", action: "sign_up" %>
 
@@ -37,8 +37,10 @@
 
             <%= f.hidden_field :locale, value: I18n.locale %>
 
-            <%= f.text_field :username,  autofocus: true, maxlength: User.username_max_length,
-                                        hint: t("devise_views.users.registrations.new.username_note") %>
+            <%= f.text_field :username,
+                             autofocus: true,
+                             maxlength: User.username_max_length,
+                             hint: t("devise_views.users.registrations.new.username_note") %>
 
             <%= f.invisible_captcha :address %>
 
@@ -47,14 +49,14 @@
             <%= f.password_field :password, autocomplete: "off" %>
 
             <%= f.password_field :password_confirmation, autocomplete: "off",
-                                        label: t("devise_views.users.registrations.new.password_confirmation_label") %>
+                                 label: t("devise_views.users.registrations.new.password_confirmation_label") %>
 
             <%= f.check_box :terms_of_service,
-                              title: t("devise_views.users.registrations.new.terms_title"),
-                              label: t("devise_views.users.registrations.new.terms",
-                                       terms: link_to(t("devise_views.users.registrations.new.terms_link"), "/conditions",
-                                                      title: t("shared.target_blank"),
-                                                      target: "_blank")) %>
+                            title: t("devise_views.users.registrations.new.terms_title"),
+                            label: t("devise_views.users.registrations.new.terms",
+                                     terms: link_to(t("devise_views.users.registrations.new.terms_link"), "/conditions",
+                                                    title: t("shared.target_blank"),
+                                                    target: "_blank")) %>
 
             <div class="small-12 medium-6 small-centered">
               <%= f.submit t("devise_views.users.registrations.new.submit"), class: "button expanded" %>
@@ -64,8 +66,7 @@
       <% end %>
 
       <%= render "devise/shared/links" %>
-      
+
     </div>
- </div> 
-     </div> 
+  </div>
 </div>
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb
index 5078ecade8c..a290c928583 100644
--- a/app/views/proposals/index.html.erb
+++ b/app/views/proposals/index.html.erb
@@ -45,7 +45,6 @@
         <% end %>
       </div>
     <% end %>
-    
 
     <% unless params[:selected].present? %>
       <div class="row">
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index ad7b131bcff..bcf51f549c8 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -1,6 +1,7 @@
 <% provide :title, @proposal.title %>
 <% preview = false unless local_assigns.has_key? :preview %>
-<% content_for :meta_description do %><%= @proposal.summary %><% end %>
+<% content_for :meta_description do %><%= @proposal.summary %>
+<% end %>
 <% provide :social_media_meta_tags do %>
   <%= render "shared/social_media_meta_tags",
              social_url: proposal_url(@proposal),
@@ -63,12 +64,12 @@
                 <span class="icon-edit"></span>
                 <%= t("proposals.show.dashboard_proposal_link") %>
               <% end %>
-               <!-- New Button for copy to Budget Investment -->
-                <%= link_to select_budgets_path(proposal_id: @proposal.id),
-                  class: "button hollow expanded",
-                  id: "budget-investment-link" do %>
-                  <span class="icon-money"></span>
-                  <%= t("proposals.show.budget_investment_link") %>
+              <!-- New Button for copy to Budget Investment -->
+              <%= link_to select_budgets_path(proposal_id: @proposal.id),
+                          class: "button hollow expanded",
+                          id: "budget-investment-link" do %>
+                <span class="icon-money"></span>
+                <%= t("proposals.show.budget_investment_link") %>
               <% end %>
 
             </div>
diff --git a/app/views/valuation/budget_investments/_dossier.html.erb b/app/views/valuation/budget_investments/_dossier.html.erb
index d40ab32439c..701b43cd7e1 100644
--- a/app/views/valuation/budget_investments/_dossier.html.erb
+++ b/app/views/valuation/budget_investments/_dossier.html.erb
@@ -10,18 +10,17 @@
     <% end %>
   </p>
 
-<p id="estimated_price">
+  <p id="estimated_price">
     <strong>
       <%= t("valuation.budget_investments.show.estimated_price") %>:
     </strong>
     <% if @investment.estimated_price.present? %>
       <%= @investment.formatted_estimated_price %>
     <% else %>
-     <%= t("valuation.budget_investments.show.undefined") %>
+      <%= t("valuation.budget_investments.show.undefined") %>
     <% end %>
   </p>
 
-
   <p id="price_first_year">
     <strong>
       <%= t("valuation.budget_investments.show.price_first_year") %>:
diff --git a/app/views/valuation/budget_investments/_dossier_form.html.erb b/app/views/valuation/budget_investments/_dossier_form.html.erb
index acdcdf2366b..8f0b0b02aaf 100644
--- a/app/views/valuation/budget_investments/_dossier_form.html.erb
+++ b/app/views/valuation/budget_investments/_dossier_form.html.erb
@@ -45,10 +45,10 @@
                              label: t("valuation.budget_investments.edit.price", currency: budget.currency_symbol),
                              max: 1000000000000000 %>
         </div>
-<div class="small-12 medium-6 column">
+        <div class="small-12 medium-6 column">
           <%= f.number_field :estimated_price,
-            label: t("valuation.budget_investments.edit.estimated_price", currency: budget.currency_symbol),
-            max: 1000000000000000 %>
+                             label: t("valuation.budget_investments.edit.estimated_price", currency: budget.currency_symbol),
+                             max: 1000000000000000 %>
         </div>
 
         <div class="small-12 medium-6 column end">
diff --git a/config/locales/en/devise_views.yml b/config/locales/en/devise_views.yml
index aa6d26c13eb..127c0aed7b2 100644
--- a/config/locales/en/devise_views.yml
+++ b/config/locales/en/devise_views.yml
@@ -107,6 +107,7 @@ en:
           username_is_available: Username available
           username_is_not_available: Username already in use
           username_note: Name that appears next to your posts
+          terms_title: "Terms of Service"
         success:
           back_to_index: I understand; go back to main page
           instructions_1: Please <b>check your email</b> - we have sent you a <b>link to confirm your account</b>.
diff --git a/config/locales/fi-FI/devise_views.yml b/config/locales/fi-FI/devise_views.yml
index 0eba035da0f..e0ecabb47c5 100644
--- a/config/locales/fi-FI/devise_views.yml
+++ b/config/locales/fi-FI/devise_views.yml
@@ -26,6 +26,7 @@ fi:
         new:
           password_confirmation_label: Vahvista salasana
           submit: Rekisteröidy
+          title: "Register as an Organisation"
         success:
           back_to_index: Ymmärrän; Mene takaisin pääsivulle
     passwords: