diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index fecd29419..0b9929f46 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -129,20 +129,6 @@
       </ul>
     </li>
 
-    <li class="section-title" <%= 'class=active' if controller_name == 'geozones' %>>
-      <%= link_to admin_geozones_path do %>
-        <strong><%= t('admin.menu.geozones') %></strong>
-      <% end %>
-    </li>
-
-    <% if feature?(:signature_sheets) %>
-      <li class="section-title" <%= "class=active" if controller_name == "signature_sheets" %>>
-        <%= link_to admin_signature_sheets_path do %>
-          <strong><%= t("admin.menu.signature_sheets") %></strong>
-        <% end %>
-      </li>
-    <% end %>
-
     <li class="section-title">
       <a href="#">
         <span class="icon-settings"></span>
@@ -162,5 +148,19 @@
         </li>
       </ul>
     </li>
+
+    <li class="section-title" <%= 'class=active' if controller_name == 'geozones' %>>
+      <%= link_to admin_geozones_path do %>
+        <strong><%= t('admin.menu.geozones') %></strong>
+      <% end %>
+    </li>
+
+    <% if feature?(:signature_sheets) %>
+      <li class="section-title" <%= "class=active" if controller_name == "signature_sheets" %>>
+        <%= link_to admin_signature_sheets_path do %>
+          <strong><%= t("admin.menu.signature_sheets") %></strong>
+        <% end %>
+      </li>
+    <% end %>
   </ul>
 </div>
diff --git a/app/views/admin/site_customization/content_blocks/_form.html.erb b/app/views/admin/site_customization/content_blocks/_form.html.erb
index b5a692d87..ae9d684d4 100644
--- a/app/views/admin/site_customization/content_blocks/_form.html.erb
+++ b/app/views/admin/site_customization/content_blocks/_form.html.erb
@@ -14,34 +14,35 @@
   </div>
 
   <% end %>
+  <div class="row">
+    <div class="small-12 medium-6 column">
+      <%= f.label :name %>
+      <%= f.select :name, SiteCustomization::ContentBlock::VALID_BLOCKS, label: false %>
+    </div>
+    <div class="small-12 medium-6 column">
+      <%= f.label :locale %>
+      <%= f.select :locale, I18n.available_locales, label: false %>
+    </div>
 
-  <div class="small-12 medium-6 column">
-    <%= f.label :name %>
-    <%= f.select :name, SiteCustomization::ContentBlock::VALID_BLOCKS, label: false %>
-  </div>
-  <div class="small-12 medium-6 column">
-    <%= f.label :locale %>
-    <%= f.select :locale, I18n.available_locales, label: false %>
-  </div>
-
-  <div class="small-12 column">
-    <%= f.label :body %>
-    <%= f.text_area :body, label: false, rows: 10 %>
-    <%= f.submit class: "button success" %>
+    <div class="small-12 column">
+      <%= f.label :body %>
+      <%= f.text_area :body, label: false, rows: 10 %>
+      <div class="small-12 medium-6 large-4">
+        <%= f.submit class: "button success expanded" %>
+      </div>
+    </div>
   </div>
 
 <% end %>
 
-<h4><%= t('.content_blocks_information') %></h4>
+<h3><%= t('.content_blocks_information') %></h3>
 
 <p><%= t('.content_block_about') %></p>
 
 <p><%= t('.content_block_top_links_html') %></p>
-<pre>
-&lt;li&gt;&lt;a href=&quot;http://site1.com&quot;&gt;Site 1&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;&lt;a href=&quot;http://site2.com&quot;&gt;Site 2&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;&lt;a href=&quot;http://site3.com&quot;&gt;Site 3&lt;/a&gt;&lt;/li&gt;
-</pre>
-<br>
 
-<p><%= t('.content_block_footer_html') %></p>
+<code>&lt;li&gt;&lt;a href=&quot;http://site1.com&quot;&gt;Site 1&lt;/a&gt;&lt;/li&gt;</code><br>
+<code>&lt;li&gt;&lt;a href=&quot;http://site2.com&quot;&gt;Site 2&lt;/a&gt;&lt;/li&gt;</code><br>
+<code>&lt;li&gt;&lt;a href=&quot;http://site3.com&quot;&gt;Site 3&lt;/a&gt;&lt;/li&gt;</code><br>
+
+<p class="margin-top"><%= t('.content_block_footer_html') %></p>
diff --git a/app/views/admin/site_customization/content_blocks/edit.html.erb b/app/views/admin/site_customization/content_blocks/edit.html.erb
index c96f9a810..9c2694449 100644
--- a/app/views/admin/site_customization/content_blocks/edit.html.erb
+++ b/app/views/admin/site_customization/content_blocks/edit.html.erb
@@ -2,14 +2,13 @@
   Admin - <%= t("admin.menu.site_customization.content_blocks") %> - <%= @content_block.name %> (<%= @content_block.locale %>)
 <% end %>
 
-<%= link_to admin_site_customization_content_blocks_path, class: "back" do %>
-  <span class="icon-angle-left"></span>
-  <%= t("admin.site_customization.content_blocks.edit.back") %>
-<% end %>
+<%= back_link_to admin_site_customization_content_blocks_path %>
 
-<%= button_to t("admin.site_customization.content_blocks.index.delete"), admin_site_customization_content_block_path(@content_block), method: :delete, class: "button hollow alert float-right margin-right" %>
+<%= button_to t("admin.site_customization.content_blocks.index.delete"), admin_site_customization_content_block_path(@content_block), method: :delete, class: "button hollow alert float-right small" %>
 
-<div class="row margin-top">
-  <h2><%= t("admin.site_customization.content_blocks.edit.title") %></h2>
-  <%= render 'form' %>
+<div class="row">
+  <div class="small-12 column">
+    <h2><%= t("admin.site_customization.content_blocks.edit.title") %></h2>
+    <%= render 'form' %>
+  </div>
 </div>
diff --git a/app/views/admin/site_customization/content_blocks/index.html.erb b/app/views/admin/site_customization/content_blocks/index.html.erb
index 653e3e731..e9fc664d1 100644
--- a/app/views/admin/site_customization/content_blocks/index.html.erb
+++ b/app/views/admin/site_customization/content_blocks/index.html.erb
@@ -2,28 +2,29 @@
   Admin - <%= t("admin.menu.site_customization.content_blocks") %>
 <% end %>
 
-<%= link_to t("admin.site_customization.content_blocks.index.create"), new_admin_site_customization_content_block_path, class: "button float-right margin-right" %>
+<%= link_to t("admin.site_customization.content_blocks.index.create"), new_admin_site_customization_content_block_path, class: "button float-right" %>
+
 <h2 class="inline-block"><%= t("admin.site_customization.content_blocks.index.title") %></h2>
 
-  <table class="cms_page_list">
-    <thead>
-      <tr>
-        <th><%= t("admin.site_customization.content_blocks.content_block.name") %></th>
-        <th><%= t("admin.site_customization.content_blocks.content_block.body") %></th>
-        <th></th>
-      </tr>
-    </thead>
-    <tbody>
-    <% @content_blocks.each do |content_block| %>
-      <tr id="<%= dom_id(content_block) %>">
-        <td><%= link_to "#{content_block.name} (#{content_block.locale})", edit_admin_site_customization_content_block_path(content_block) %></td>
-        <td><%= content_block.body %></td>
-        <td>
-          <%= button_to t("admin.site_customization.content_blocks.index.delete"),
-                        admin_site_customization_content_block_path(content_block),
-                        method: :delete, class: "button hollow alert" %>
-        </td>
-      </tr>
-    <% end %>
-    </tbody>
-  </table>
+<table class="cms_page_list">
+  <thead>
+    <tr>
+      <th><%= t("admin.site_customization.content_blocks.content_block.name") %></th>
+      <th><%= t("admin.site_customization.content_blocks.content_block.body") %></th>
+      <th><%= t("admin.actions.actions") %></th>
+    </tr>
+  </thead>
+  <tbody>
+  <% @content_blocks.each do |content_block| %>
+    <tr id="<%= dom_id(content_block) %>">
+      <td><%= link_to "#{content_block.name} (#{content_block.locale})", edit_admin_site_customization_content_block_path(content_block) %></td>
+      <td><%= content_block.body.html_safe %></td>
+      <td>
+        <%= button_to t("admin.site_customization.content_blocks.index.delete"),
+                      admin_site_customization_content_block_path(content_block),
+                      method: :delete, class: "button hollow alert" %>
+      </td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>
diff --git a/app/views/admin/site_customization/content_blocks/new.html.erb b/app/views/admin/site_customization/content_blocks/new.html.erb
index 75ff5f389..6a5a1e0b3 100644
--- a/app/views/admin/site_customization/content_blocks/new.html.erb
+++ b/app/views/admin/site_customization/content_blocks/new.html.erb
@@ -2,13 +2,11 @@
   Admin - <%= t("admin.menu.site_customization.content_blocks") %> - <%= t("admin.site_customization.content_blocks.new.title") %>
 <% end %>
 
-<%= link_to admin_site_customization_content_blocks_path, class: "back" do %>
-  <span class="icon-angle-left"></span>
-  <%= t("admin.site_customization.content_blocks.new.back") %>
-<% end %>
+<%= back_link_to admin_site_customization_content_blocks_path %>
 
-<div class="row margin-top">
-  <h2><%= t("admin.site_customization.content_blocks.new.title") %></h2>
-  <%= render 'form' %>
+<div class="row">
+  <div class="small-12 column">
+    <h2><%= t("admin.site_customization.content_blocks.new.title") %></h2>
+    <%= render 'form' %>
+  </div>
 </div>
-
diff --git a/app/views/admin/site_customization/images/index.html.erb b/app/views/admin/site_customization/images/index.html.erb
index b9de152d1..95b9e18a7 100644
--- a/app/views/admin/site_customization/images/index.html.erb
+++ b/app/views/admin/site_customization/images/index.html.erb
@@ -1,6 +1,12 @@
 <h2><%= t("admin.site_customization.images.index.title") %></h2>
 
 <table>
+  <thead>
+    <tr>
+      <th><%= t("admin.site_customization.images.index.image") %></th>
+      <th><%= t("admin.actions.actions") %></th>
+    </tr>
+  </thead>
   <tbody>
     <% @images.each do |image| %>
       <tr class="<%= image.name %>">
diff --git a/app/views/admin/site_customization/pages/_form.html.erb b/app/views/admin/site_customization/pages/_form.html.erb
index 197520631..2c0d38ba6 100644
--- a/app/views/admin/site_customization/pages/_form.html.erb
+++ b/app/views/admin/site_customization/pages/_form.html.erb
@@ -1,21 +1,44 @@
 <%= form_for [:admin, @page], html: {class: "edit_page", data: {watch_changes: true}} do |f| %>
 
   <% if @page.errors.any? %>
+    <div id="error_explanation" data-alert class="callout alert" data-closable>
+      <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
+        <span aria-hidden="true">&times;</span>
+      </button>
 
-  <div id="error_explanation" data-alert class="callout alert" data-closable>
-    <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
-      <span aria-hidden="true">&times;</span>
-    </button>
-
-    <strong>
-      <%= @page.errors.count %>
-      <%= t("admin.site_customization.pages.errors.form.error", count: @page.errors.count) %>
-    </strong>
-  </div>
-
+      <strong>
+        <%= @page.errors.count %>
+        <%= t("admin.site_customization.pages.errors.form.error", count: @page.errors.count) %>
+      </strong>
+    </div>
   <% end %>
 
-  <div class="small-12 medium-9 column">
+  <div class="row">
+    <div class="small-12 column">
+      <hr>
+    </div>
+    <div class="small-12 medium-5 column">
+      <h3><%= t("admin.site_customization.pages.form.options") %></h3>
+      <%= f.check_box :more_info_flag, class: "small" %>
+      <%= f.check_box :print_content_flag %>
+    </div>
+    <div class="small-12 medium-3 column">
+      <%= f.label :status %>
+      <% ::SiteCustomization::Page::VALID_STATUSES.each do |status| %>
+        <%= f.radio_button :status, status, label: false %>
+        <%= f.label "status_#{status}", t("admin.site_customization.pages.page.status_#{status}") %>
+        <br>
+      <% end %>
+    </div>
+    <div class="small-12 medium-4 column">
+      <%= f.label :slug %>
+      <%= f.text_field :slug, label: false, size: 80, maxlength: 80 %>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="small-12 column">
+      <hr>
 
       <%= f.label :title %>
       <%= f.text_field :title, label: false %>
@@ -23,30 +46,14 @@
       <%= f.label :subtitle %>
       <%= f.text_field :subtitle, label: false, size: 80, maxlength: 80 %>
 
-      <%= f.label :slug %>
-      <%= f.text_field :slug, label: false, size: 80, maxlength: 80 %>
-
       <div class="ckeditor margin-top">
         <%= f.label :content %>
         <%= f.cktext_area :content, label: false, cols: 80, rows: 10, ckeditor: { language: I18n.locale } %>
       </div>
-  </div>
-  <div class="small-12 medium-3 column">
-    <div class="page_edit">
-      <h4><%= t("admin.site_customization.pages.form.options") %></h4>
-      <%= f.check_box :more_info_flag %>
-      <%= f.check_box :print_content_flag %>
-      <hr>
 
-      <h4><%= f.label :status %></h4>
-      <% ::SiteCustomization::Page::VALID_STATUSES.each do |status| %>
-        <%= f.radio_button :status, status, label: false %>
-        <%= f.label "status_#{status}", t("admin.site_customization.pages.page.status_#{status}") %>
-        <br/>
-      <% end %>
-
-      <%= f.submit class: "button success" %>
+      <div class="small-12 medium-6 large-4">
+        <%= f.submit class: "button success expanded" %>
+      </div>
     </div>
-
   </div>
 <% end %>
diff --git a/app/views/admin/site_customization/pages/edit.html.erb b/app/views/admin/site_customization/pages/edit.html.erb
index c92933cbf..9a2fc92ab 100644
--- a/app/views/admin/site_customization/pages/edit.html.erb
+++ b/app/views/admin/site_customization/pages/edit.html.erb
@@ -2,14 +2,13 @@
   Admin - <%= t("admin.menu.site_customization.pages") %> - <%= @page.title %>
 <% end %>
 
-<%= link_to admin_site_customization_pages_path, class: "back" do %>
-  <span class="icon-angle-left"></span>
-  <%= t("admin.site_customization.pages.edit.back") %>
-<% end %>
+<%= back_link_to admin_site_customization_pages_path %>
 
-<%= button_to t("admin.site_customization.pages.index.delete"), admin_site_customization_page_path(@page), method: :delete, class: "button hollow alert float-right margin-right" %>
+<%= button_to t("admin.site_customization.pages.index.delete"), admin_site_customization_page_path(@page), method: :delete, class: "button hollow alert small float-right" %>
 
-<div class="row margin-top">
-  <h2><%= t("admin.site_customization.pages.edit.title", page_title: @page.title) %></h2>
-  <%= render 'form' %>
+<div class="row">
+  <div class="small-12 column">
+    <h2><%= t("admin.site_customization.pages.edit.title", page_title: @page.title) %></h2>
+    <%= render 'form' %>
+  </div>
 </div>
diff --git a/app/views/admin/site_customization/pages/index.html.erb b/app/views/admin/site_customization/pages/index.html.erb
index eef3370e6..f81631640 100644
--- a/app/views/admin/site_customization/pages/index.html.erb
+++ b/app/views/admin/site_customization/pages/index.html.erb
@@ -2,42 +2,45 @@
   Admin - <%= t("admin.menu.site_customization.pages") %>
 <% end %>
 
-<%= link_to t("admin.site_customization.pages.index.create"), new_admin_site_customization_page_path, class: "button float-right margin-right" %>
+<%= link_to t("admin.site_customization.pages.index.create"), new_admin_site_customization_page_path, class: "button float-right" %>
 <h2 class="inline-block"><%= t("admin.site_customization.pages.index.title") %></h2>
 
-  <h3><%= page_entries_info @pages %></h3>
+<h3><%= page_entries_info @pages %></h3>
 
-  <table class="cms_page_list">
-    <thead>
-      <tr>
-        <th><%= t("admin.site_customization.pages.page.title") %></th>
-        <th><%= t("admin.site_customization.pages.page.created_at") %></th>
-        <th><%= t("admin.site_customization.pages.page.updated_at") %></th>
-        <th><%= t("admin.site_customization.pages.page.status") %></th>
-        <th></th>
-        <th></th>
-      </tr>
-    </thead>
-    <tbody>
-    <% @pages.each do |page| %>
-      <tr id="<%= dom_id(page) %>">
-        <td>
-          <%= link_to page.title, edit_admin_site_customization_page_path(page) %>
-        </td>
-        <td><%= I18n.l page.created_at, format: :short %></td>
-        <td><%= I18n.l page.created_at, format: :short %></td>
-        <td><%= t("admin.site_customization.pages.page.status_#{page.status}") %></td>
-        <td class="small">
-          <span class="icon-eye"></span>
-          <%= link_to t("admin.site_customization.pages.index.see_page"), page.url %>
-        </td>
-        <td class="small">
-          <span class="icon-x"></span>
-          <%= link_to t("admin.site_customization.pages.index.delete"), admin_site_customization_page_path(page), method: :delete %>
-        </td>
-      </tr>
-    <% end %>
-    </tbody>
-  </table>
+<table class="cms_page_list">
+  <thead>
+    <tr>
+      <th><%= t("admin.site_customization.pages.page.title") %></th>
+      <th><%= t("admin.site_customization.pages.page.created_at") %></th>
+      <th><%= t("admin.site_customization.pages.page.updated_at") %></th>
+      <th><%= t("admin.site_customization.pages.page.status") %></th>
+      <th colspan="2"><%= t("admin.actions.actions") %></th>
+    </tr>
+  </thead>
+  <tbody>
+  <% @pages.each do |page| %>
+    <tr id="<%= dom_id(page) %>">
+      <td>
+        <%= link_to page.title, edit_admin_site_customization_page_path(page) %>
+      </td>
+      <td><%= I18n.l page.created_at, format: :short %></td>
+      <td><%= I18n.l page.created_at, format: :short %></td>
+      <td><%= t("admin.site_customization.pages.page.status_#{page.status}") %></td>
+      <td class="small">
+        <span class="icon-eye"></span>
+        <% if page.status == "published" %>
+          <%= link_to t("admin.site_customization.pages.index.see_page"), page.url, target: "_blank" %>
+        <% else %>
+          <%=  t("admin.site_customization.pages.index.see_page") %>
+        <% end %>
+      </td>
+      <td class="small delete">
+        <span class="icon-x"></span>
+        <%= link_to t("admin.site_customization.pages.index.delete"), admin_site_customization_page_path(page), method: :delete, class: "delete" %>
+      </td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>
 
-  <%= paginate @pages %>
+<%= paginate @pages %>
diff --git a/app/views/admin/site_customization/pages/new.html.erb b/app/views/admin/site_customization/pages/new.html.erb
index 43a86d108..2d555c5b8 100644
--- a/app/views/admin/site_customization/pages/new.html.erb
+++ b/app/views/admin/site_customization/pages/new.html.erb
@@ -2,13 +2,11 @@
   Admin - <%= t("admin.menu.site_customization.pages") %> - <%= t("admin.site_customization.pages.new.title") %>
 <% end %>
 
-<%= link_to admin_site_customization_pages_path, class: "back" do %>
-  <span class="icon-angle-left"></span>
-  <%= t("admin.site_customization.pages.new.back") %>
-<% end %>
+<%= back_link_to admin_site_customization_pages_path %>
 
-<div class="row margin-top">
-  <h2><%= t("admin.site_customization.pages.new.title") %></h2>
-  <%= render 'form' %>
+<div class="row">
+  <div class="small-12 column">
+    <h2><%= t("admin.site_customization.pages.new.title") %></h2>
+    <%= render 'form' %>
+  </div>
 </div>
-
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index 5ae6d6f49..7b937db8b 100755
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -679,16 +679,14 @@ en:
           notice: Content block deleted successfully
         edit:
           title: Editing content block
-          back: Back
         errors:
           form:
             error: Error
         index:
           create: Create new content block
-          delete: Delete
+          delete: Delete block
           title: Content blocks
         new:
-          back: Back
           title: Create new content block
         content_block:
           body: Body
@@ -698,6 +696,7 @@ en:
           title: Custom images
           update: Update
           delete: Delete
+          image: Image
         update:
           notice: Image updated successfully
           error: Image couldn't be updated
@@ -715,7 +714,6 @@ en:
           notice: Page deleted successfully
         edit:
           title: Editing %{page_title}
-          back: Back
         errors:
           form:
             error: Error
@@ -723,11 +721,10 @@ en:
           options: Options
         index:
           create: Create new page
-          delete: Delete
+          delete: Delete page
           title: Custom Pages
           see_page: See page
         new:
-          back: Back
           title: Create new custom page
         page:
           created_at: Created at
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index f5db64135..160b187ea 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -679,16 +679,14 @@ es:
           notice: Bloque borrado correctamente
         edit:
           title: Editar bloque
-          back: Volver
         errors:
           form:
             error: Error
         index:
           create: Crear nuevo bloque
-          delete: Borrar
+          delete: Borrar bloque
           title: Bloques
         new:
-          back: Volver
           title: Crear nuevo bloque
         content_block:
           body: Contenido
@@ -698,6 +696,7 @@ es:
           title: Personalizar imágenes
           update: Actualizar
           delete: Borrar
+          image: Imagen
         update:
           notice: Imagen actualizada correctamente
           error: No se ha podido actualizar la imagen
@@ -715,7 +714,6 @@ es:
           notice: Página eliminada correctamente
         edit:
           title: Editar %{page_title}
-          back: Volver
         errors:
           form:
             error: Error
@@ -723,11 +721,10 @@ es:
           options: Opciones
         index:
           create: Crear nueva página
-          delete: Borrar
+          delete: Borrar página
           title: Páginas
           see_page: Ver página
         new:
-          back: Back
           title: Página nueva
         page:
           created_at: Creada
diff --git a/spec/features/admin/site_customization/content_blocks_spec.rb b/spec/features/admin/site_customization/content_blocks_spec.rb
index cc5dca34c..de2155737 100644
--- a/spec/features/admin/site_customization/content_blocks_spec.rb
+++ b/spec/features/admin/site_customization/content_blocks_spec.rb
@@ -88,7 +88,7 @@ feature "Admin custom content blocks" do
       expect(page).to have_content("#{block.name} (#{block.locale})")
       expect(page).to have_content(block.body)
 
-      click_button "Delete"
+      click_button "Delete block"
 
       expect(page).to_not have_content("#{block.name} (#{block.locale})")
       expect(page).to_not have_content(block.body)
@@ -98,7 +98,7 @@ feature "Admin custom content blocks" do
       block = create(:site_customization_content_block)
       visit edit_admin_site_customization_content_block_path(block)
 
-      click_button "Delete"
+      click_button "Delete block"
 
       expect(page).to_not have_content("#{block.name} (#{block.locale})")
       expect(page).to_not have_content(block.body)
diff --git a/spec/features/admin/site_customization/pages_spec.rb b/spec/features/admin/site_customization/pages_spec.rb
index 5d03638d8..3e940ea69 100644
--- a/spec/features/admin/site_customization/pages_spec.rb
+++ b/spec/features/admin/site_customization/pages_spec.rb
@@ -62,7 +62,7 @@ feature "Admin custom pages" do
     custom_page = create(:site_customization_page, title: "An example custom page")
     visit edit_admin_site_customization_page_path(custom_page)
 
-    click_button "Delete"
+    click_button "Delete page"
 
     expect(page).to_not have_content("An example custom page")
   end