diff --git a/app/views/admin/budget_investments/edit.html.erb b/app/views/admin/budget_investments/edit.html.erb
index e1f48f0c9..ef6540c9e 100644
--- a/app/views/admin/budget_investments/edit.html.erb
+++ b/app/views/admin/budget_investments/edit.html.erb
@@ -4,130 +4,132 @@
 
 <%= render "shared/globalize_locales", resource: @investment %>
 
-<%= translatable_form_for @investment,
-                          url: admin_budget_budget_investment_path(@budget, @investment) do |f| %>
+<div class="row">
+  <%= translatable_form_for @investment,
+                            url: admin_budget_budget_investment_path(@budget, @investment) do |f| %>
 
-  <%= render "shared/errors", resource: @investment %>
+    <%= render "shared/errors", resource: @investment %>
 
-  <% Budget::Investment.filter_params(params).to_h.each do |filter_name, filter_value| %>
-   <%= hidden_field_tag filter_name, filter_value %>
-  <% end %>
-
-  <div class="row expanded">
-    <%= f.translatable_fields do |translations_form| %>
-      <div class="small-12 column">
-        <%= translations_form.text_field :title,
-              maxlength: Budget::Investment.title_max_length %>
-      </div>
-
-      <div class="ckeditor small-12 column">
-        <%= translations_form.cktext_area :description,
-              maxlength: Budget::Investment.description_max_length,
-              ckeditor: { language: I18n.locale } %>
-      </div>
+    <% Budget::Investment.filter_params(params).to_h.each do |filter_name, filter_value| %>
+     <%= hidden_field_tag filter_name, filter_value %>
     <% end %>
 
-    <div class="small-12 column">
-      <%= f.label :tag_list, t("admin.budget_investments.edit.user_tags") %>
-      <%= f.text_field :tag_list,
-                       value: @investment.tag_list.sort.join(","),
-                       label: false %>
-    </div>
+    <div class="row expanded">
+      <%= f.translatable_fields do |translations_form| %>
+        <div class="small-12 column">
+          <%= translations_form.text_field :title,
+                maxlength: Budget::Investment.title_max_length %>
+        </div>
 
-    <div class="small-12 column">
-      <div class="small-12 medium-6">
-        <%= f.text_field :external_url %>
+        <div class="ckeditor small-12 column">
+          <%= translations_form.cktext_area :description,
+                maxlength: Budget::Investment.description_max_length,
+                ckeditor: { language: I18n.locale } %>
+        </div>
+      <% end %>
+
+      <div class="small-12 column">
+        <%= f.label :tag_list, t("admin.budget_investments.edit.user_tags") %>
+        <%= f.text_field :tag_list,
+                         value: @investment.tag_list.sort.join(","),
+                         label: false %>
       </div>
 
-      <div class="small-12 medium-6">
-        <%= f.select :heading_id, budget_heading_select_options(@budget), include_blank: t("admin.budget_investments.edit.select_heading") %>
-      </div>
-    </div>
-  </div>
+      <div class="small-12 column">
+        <div class="small-12 medium-6">
+          <%= f.text_field :external_url %>
+        </div>
 
-  <div class="row expanded margin-top">
-
-    <div class="small-12 column">
-      <h2 id="classification"><%= t("admin.budget_investments.edit.classification") %></h2>
-
-      <div class="small-12 medium-6">
-        <%= f.select(:administrator_id,
-                       @admins.collect{ |a| [a.description_or_name_and_email, a.id ] },
-                       { include_blank: t("admin.budget_investments.edit.undefined") }) %>
+        <div class="small-12 medium-6">
+          <%= f.select :heading_id, budget_heading_select_options(@budget), include_blank: t("admin.budget_investments.edit.select_heading") %>
+        </div>
       </div>
     </div>
 
-    <div class="small-12 column">
-      <%= f.label :valuation_tag_list, t("admin.budget_investments.edit.tags") %>
-      <div class="tags">
-        <% @tags.each do |tag| %>
-          <a class="js-add-tag-link"><%= tag.name %></a>
+    <div class="row expanded margin-top">
+
+      <div class="small-12 column">
+        <h2 id="classification"><%= t("admin.budget_investments.edit.classification") %></h2>
+
+        <div class="small-12 medium-6">
+          <%= f.select(:administrator_id,
+                         @admins.collect{ |a| [a.description_or_name_and_email, a.id ] },
+                         { include_blank: t("admin.budget_investments.edit.undefined") }) %>
+        </div>
+      </div>
+
+      <div class="small-12 column">
+        <%= f.label :valuation_tag_list, t("admin.budget_investments.edit.tags") %>
+        <div class="tags">
+          <% @tags.each do |tag| %>
+            <a class="js-add-tag-link"><%= tag.name %></a>
+          <% end %>
+        </div>
+        <%= f.text_field :valuation_tag_list,
+                          value: @investment.valuation_tag_list.sort.join(","),
+                          label: false,
+                          placeholder: t("admin.budget_investments.edit.tags_placeholder"),
+                          class: "js-tag-list" %>
+      </div>
+
+      <div class="small-12 column margin-top">
+        <%= f.label :valuator_ids, t("admin.budget_investments.edit.user_groups") %>
+        <ul>
+        <%= f.collection_check_boxes :valuator_group_ids, @valuator_groups, :id, :name do |group| %>
+          <li><%= group.label(title: group.object.name) { group.check_box + truncate(group.object.name, length: 60) } %></li>
+        <% end %>
+        </ul>
+      </div>
+
+      <div class="small-12 column">
+        <hr>
+        <%= f.label :valuator_ids, t("admin.budget_investments.edit.assigned_valuators") %>
+        <ul>
+          <%= f.collection_check_boxes :valuator_ids, @valuators, :id, :email do |b| %>
+              <li><%= b.label(title: valuator_label(b.object)) { b.check_box + truncate(b.object.description_or_email, length: 60) } %></li>
+          <% end %>
+        </ul>
+      </div>
+
+      <div class="small-12 column">
+        <hr>
+        <%= f.label :tracker_ids, t("admin.budget_investments.edit.assigned_trackers") %>
+        <ul>
+          <%= f.collection_check_boxes :tracker_ids, @trackers, :id, :email do |b| %>
+            <li><%= b.label(title: tracker_label(b.object)) { b.check_box + truncate(b.object.description_or_email, length: 60) } %></li>
+          <% end %>
+        </ul>
+      </div>
+    </div>
+
+    <div class="row expanded margin-top">
+      <% if @investment.incompatible? || @investment.winner? %>
+      <div class="small-12 medium-3 column">
+        <h2 id="incompatible"><%= t("admin.budget_investments.edit.compatibility") %></h2>
+        <%= f.label :incompatible do %>
+          <%= f.check_box :incompatible, title: t("admin.budget_investments.edit.compatibility"), label: false %>
+          <span class="checkbox"><%= t("admin.budget_investments.edit.mark_as_incompatible") %></span>
+        <% end %>
+      </div>
+      <% end %>
+      <div class="small-12 medium-3 column float-left">
+        <h2 id="selected"><%= t("admin.budget_investments.edit.selection") %></h2>
+        <%= f.label :selected do %>
+          <%= f.check_box :selected, title: t("admin.budget_investments.edit.selection"), label: false %>
+          <span class="checkbox"><%= t("admin.budget_investments.edit.mark_as_selected") %></span>
         <% end %>
       </div>
-      <%= f.text_field :valuation_tag_list,
-                        value: @investment.valuation_tag_list.sort.join(","),
-                        label: false,
-                        placeholder: t("admin.budget_investments.edit.tags_placeholder"),
-                        class: "js-tag-list" %>
     </div>
 
+    <div class="small-12 column">
+      <%= f.text_field :milestone_tag_list,
+                     value: @investment.milestone_tag_list.sort.join(", "),
+                     label: t("admin.budget_investments.edit.milestone_tags") %>
+    </div>
+
+
     <div class="small-12 column margin-top">
-      <%= f.label :valuator_ids, t("admin.budget_investments.edit.user_groups") %>
-      <ul>
-      <%= f.collection_check_boxes :valuator_group_ids, @valuator_groups, :id, :name do |group| %>
-        <li><%= group.label(title: group.object.name) { group.check_box + truncate(group.object.name, length: 60) } %></li>
-      <% end %>
-      </ul>
+      <%= f.submit(class: "button", value: t("admin.budget_investments.edit.submit_button")) %>
     </div>
-
-    <div class="small-12 column">
-      <hr>
-      <%= f.label :valuator_ids, t("admin.budget_investments.edit.assigned_valuators") %>
-      <ul>
-        <%= f.collection_check_boxes :valuator_ids, @valuators, :id, :email do |b| %>
-            <li><%= b.label(title: valuator_label(b.object)) { b.check_box + truncate(b.object.description_or_email, length: 60) } %></li>
-        <% end %>
-      </ul>
-    </div>
-
-    <div class="small-12 column">
-      <hr>
-      <%= f.label :tracker_ids, t("admin.budget_investments.edit.assigned_trackers") %>
-      <ul>
-        <%= f.collection_check_boxes :tracker_ids, @trackers, :id, :email do |b| %>
-          <li><%= b.label(title: tracker_label(b.object)) { b.check_box + truncate(b.object.description_or_email, length: 60) } %></li>
-        <% end %>
-      </ul>
-    </div>
-  </div>
-
-  <div class="row expanded margin-top">
-    <% if @investment.incompatible? || @investment.winner? %>
-    <div class="small-12 medium-3 column">
-      <h2 id="incompatible"><%= t("admin.budget_investments.edit.compatibility") %></h2>
-      <%= f.label :incompatible do %>
-        <%= f.check_box :incompatible, title: t("admin.budget_investments.edit.compatibility"), label: false %>
-        <span class="checkbox"><%= t("admin.budget_investments.edit.mark_as_incompatible") %></span>
-      <% end %>
-    </div>
-    <% end %>
-    <div class="small-12 medium-3 column float-left">
-      <h2 id="selected"><%= t("admin.budget_investments.edit.selection") %></h2>
-      <%= f.label :selected do %>
-        <%= f.check_box :selected, title: t("admin.budget_investments.edit.selection"), label: false %>
-        <span class="checkbox"><%= t("admin.budget_investments.edit.mark_as_selected") %></span>
-      <% end %>
-    </div>
-  </div>
-
-  <div class="small-12 column">
-    <%= f.text_field :milestone_tag_list,
-                   value: @investment.milestone_tag_list.sort.join(", "),
-                   label: t("admin.budget_investments.edit.milestone_tags") %>
-  </div>
-
-
-  <div class="small-12 column margin-top">
-    <%= f.submit(class: "button", value: t("admin.budget_investments.edit.submit_button")) %>
-  </div>
-<% end %>
+  <% end %>
+</div>