diff --git a/app/views/admin/settings/_filter_subnav.html.erb b/app/views/admin/settings/_filter_subnav.html.erb
index cbcdcdbd5..98b4f1286 100644
--- a/app/views/admin/settings/_filter_subnav.html.erb
+++ b/app/views/admin/settings/_filter_subnav.html.erb
@@ -30,6 +30,8 @@
   </li>
 
   <li class="tabs-title" id="proposals-tab">
-    <%= link_to t('admin.settings.index.proposals.title'), '#tab-proposals' %>
+    <%= link_to "#tab-proposals" do %>
+      <%= t("admin.settings.index.dashboard.title") %>
+    <% end %>
   </li>
 </ul>
diff --git a/app/views/admin/settings/_proposals.html.erb b/app/views/admin/settings/_proposals.html.erb
deleted file mode 100644
index e9c9b4a28..000000000
--- a/app/views/admin/settings/_proposals.html.erb
+++ /dev/null
@@ -1,31 +0,0 @@
-<h2><%= t('admin.settings.index.proposals.title') %></h2>
-
-<table>
-  <tbody>
-    <tr>
-      <td class="small-12 medium-4">
-        <strong><%= t("settings.#{successful_proposal_setting.key}") %></strong>
-      </td>
-      <td class="small-12 medium-8">
-        <%= form_for(successful_proposal_setting, url: admin_setting_path(successful_proposal_setting), html: { id: "edit_#{dom_id(successful_proposal_setting)}"}) do |f| %>
-          <div class="small-12 medium-6 large-9 column">
-            <%= f.select :value, successful_proposals.collect { |p| [p.title, p.id] }, { include_blank: true, label: false }, label: false, id: dom_id(successful_proposal_setting) %>
-          </div>
-          <div class="small-12 medium-6 large-3 column">
-            <%= f.submit(t('admin.settings.index.update_setting'), class: "button hollow expanded") %>
-          </div>
-        <% end %>
-      </td>
-    </tr>
-
-    <%= render 'setting_text_field', setting: poll_feature_short_title_setting %>
-    <%= render 'setting_textarea_field', setting: poll_feature_description_setting %>
-    <%= render 'setting_text_field', setting: poll_feature_link_setting %>
-
-    <%= render 'setting_text_field', setting: email_feature_short_title_setting %>
-    <%= render 'setting_textarea_field', setting: email_feature_description_setting %>
-
-    <%= render 'setting_text_field', setting: poster_feature_short_title_setting %>
-    <%= render 'setting_textarea_field', setting: poster_feature_description_setting %>
-  </tbody>
-</table>
diff --git a/app/views/admin/settings/_proposals_dashboard.html.erb b/app/views/admin/settings/_proposals_dashboard.html.erb
new file mode 100644
index 000000000..389810b54
--- /dev/null
+++ b/app/views/admin/settings/_proposals_dashboard.html.erb
@@ -0,0 +1,42 @@
+<h2><%= t("admin.settings.index.dashboard.title") %></h2>
+
+<table>
+  <tbody>
+    <tr>
+      <td class="small-12 medium-4">
+        <strong><%= t("settings.#{successful_proposal_setting.key}") %></strong>
+        <br>
+        <span class="small">
+          <%= t("settings.#{successful_proposal_setting.key}_description") %>
+        </span>
+      </td>
+      <td class="small-12 medium-8">
+        <%= form_for(successful_proposal_setting,
+                     url: admin_setting_path(successful_proposal_setting),
+                     html: { id: "edit_#{dom_id(successful_proposal_setting)}"}) do |f| %>
+
+          <div class="small-12 medium-6 large-9 column">
+            <%= f.select :value, successful_proposals.collect { |p| [p.title, p.id] },
+                                 { include_blank: true, label: false },
+                                 label: false, id: dom_id(successful_proposal_setting) %>
+          </div>
+
+          <div class="small-12 medium-6 large-3 column">
+            <%= f.submit(t("admin.settings.index.update_setting"),
+                         class: "button hollow expanded") %>
+          </div>
+        <% end %>
+      </td>
+    </tr>
+
+    <%= render 'setting_text_field',     setting: poll_feature_short_title_setting %>
+    <%= render 'setting_textarea_field', setting: poll_feature_description_setting %>
+    <%= render 'setting_text_field',     setting: poll_feature_link_setting %>
+
+    <%= render 'setting_text_field',     setting: email_feature_short_title_setting %>
+    <%= render 'setting_textarea_field', setting: email_feature_description_setting %>
+
+    <%= render 'setting_text_field',     setting: poster_feature_short_title_setting %>
+    <%= render 'setting_textarea_field', setting: poster_feature_description_setting %>
+  </tbody>
+</table>
diff --git a/app/views/admin/settings/_setting_text_field.html.erb b/app/views/admin/settings/_setting_text_field.html.erb
index 5d61d98f0..3f2529a2c 100644
--- a/app/views/admin/settings/_setting_text_field.html.erb
+++ b/app/views/admin/settings/_setting_text_field.html.erb
@@ -1,6 +1,10 @@
 <tr>
-  <td class="small-12 medium-4">
+  <td class="small-12 medium-4 align-top">
     <strong><%= t("settings.#{setting.key}") %></strong>
+    <br>
+    <span class="small">
+      <%= t("settings.#{setting.key}_description") %>
+    </span>
   </td>
   <td class="small-12 medium-8">
     <%= form_for setting,
@@ -10,9 +14,8 @@
         <%= f.text_field :value, label: false, id: dom_id(setting) %>
       </div>
       <div class="small-12 medium-6 large-3 column">
-        <%= f.submit(t('admin.settings.index.update_setting'), class: "button hollow expanded") %>
+        <%= f.submit(t("admin.settings.index.update_setting"), class: "button hollow expanded") %>
       </div>
     <% end %>
   </td>
 </tr>
-
diff --git a/app/views/admin/settings/_setting_textarea_field.html.erb b/app/views/admin/settings/_setting_textarea_field.html.erb
index 1d382fc09..cb3d57d0a 100644
--- a/app/views/admin/settings/_setting_textarea_field.html.erb
+++ b/app/views/admin/settings/_setting_textarea_field.html.erb
@@ -1,6 +1,10 @@
 <tr>
-  <td class="small-12 medium-4">
+  <td class="small-12 medium-4 align-top">
     <strong><%= t("settings.#{setting.key}") %></strong>
+    <br>
+    <span class="small">
+      <%= t("settings.#{setting.key}_description") %>
+    </span>
   </td>
   <td class="small-12 medium-8">
     <%= form_for setting,
@@ -10,9 +14,8 @@
         <%= f.cktext_area :value, label: false, id: dom_id(setting) %>
       </div>
       <div class="small-12 medium-6 large-3 column">
-        <%= f.submit(t('admin.settings.index.update_setting'), class: "button hollow expanded") %>
+        <%= f.submit(t("admin.settings.index.update_setting"), class: "button hollow expanded") %>
       </div>
     <% end %>
   </td>
 </tr>
-
diff --git a/app/views/admin/settings/index.html.erb b/app/views/admin/settings/index.html.erb
index f9f490f24..8bf9cfe42 100644
--- a/app/views/admin/settings/index.html.erb
+++ b/app/views/admin/settings/index.html.erb
@@ -23,6 +23,6 @@
   </div>
 
   <div class="tabs-panel" id="tab-proposals">
-    <%= render "proposals" %>
+    <%= render "proposals_dashboard" %>
   </div>
 </div>