diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss
index 518ccf5b1..6539759ae 100644
--- a/app/assets/stylesheets/debates.scss
+++ b/app/assets/stylesheets/debates.scss
@@ -276,7 +276,7 @@
   .panel {
     border: 0;
     border-radius: 0;
-    margin-bottom: 0;
+    margin-bottom: rem-calc(2);
     min-height: rem-calc(192);
     padding: 0 rem-calc(12) rem-calc(2) rem-calc(12);
 
@@ -418,6 +418,10 @@
     margin: 0;
   }
 
+  .edit-debate {
+    margin-bottom: 0;
+  }
+
   .debate-info {
     clear: both;
     color: $text-medium;
diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss
index d272042df..b38db6d0f 100644
--- a/app/assets/stylesheets/participacion.scss
+++ b/app/assets/stylesheets/participacion.scss
@@ -66,6 +66,10 @@
   padding: 0;
 }
 
+html, body {
+  height: 100%;
+}
+
 body {
   background: $body;
   font-family: $font-family-sans-serif;
@@ -228,6 +232,22 @@ h6 {
   border: 0;
 }
 
+.wrapper {
+  min-height: 100%;
+  margin: 0 auto rem-calc(-288);
+  height: auto !important;
+  height: 100%;
+}
+
+.footer, .push {
+  clear: both;
+  min-height: rem-calc(288);
+}
+
+.footer {
+  background: $brand;
+}
+
 // 04. Header
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -460,7 +480,6 @@ header {
 
       &:hover {
         background: none;
-        // color: $link-hover;
         color: white;
         text-decoration: underline;
         transition: text-decoration 275ms;
@@ -499,41 +518,58 @@ header {
 }
 
 .subnavigation {
-  background: rgba(255,255,255,.95);
+  background: white;
   clear: both;
-  text-transform: lowercase;
 
   @media (min-width: $small-breakpoint) {
     text-align: center;
   }
 
   a {
-    color: $link;
-    display: inline-block;
+    color: $text;
+    display: block;
     font-size: rem-calc(14);
+    font-weight: bold;
     min-width: rem-calc(192);
     position: relative;
+    text-align: left;
+    margin-left: rem-calc(12);
+
+    @media (min-width: $small-breakpoint) {
+      display: inline-block;
+      line-height: $line-height*2;
+      margin-left: 0;
+      min-width: rem-calc(192);
+      text-align: center;
+    }
 
     &:hover {
-      color: $text;
-      text-decoration: underline;
+      color: $link;
+
+      @media (min-width: $small-breakpoint) {
+        background: rgba(0,119,185,.25);
+      }
     }
 
     &.active {
-      color: $text;
-      font-weight: bold;
+      color: $link;
 
-      &:after {
-        bottom: -16px;
-        left: 50%;
-        border: solid transparent;
-        content: " ";
-        height: 0;
-        width: 0;
-        position: absolute;
-        border-top-color: rgba(255,255,255,.95);
-        border-width: 8px;
-        margin-left: -8px;
+      @media (min-width: $small-breakpoint) {
+        background: $brand;
+        color: white;
+
+        &:after {
+          bottom: -16px;
+          left: 50%;
+          border: solid transparent;
+          content: " ";
+          height: 0;
+          width: 0;
+          position: absolute;
+          border-top-color: $brand;
+          border-width: 8px;
+          margin-left: -8px;
+        }
       }
     }
   }
@@ -543,7 +579,6 @@ header {
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
 footer {
-  background: $brand;
   color: white;
   padding: rem-calc(24) 0 rem-calc(48) 0;
   text-align: justify;
@@ -608,21 +643,20 @@ footer {
 .tags {
 
   a {
-    background: $background;
-    border: 1px solid $border;
-    border-radius: 3px;
-    color: $text-medium;
+    background: #f2f2f2;
+    border-radius: rem-calc(30);
+    color: #4d4d4d;
     display: inline-block;
     font-size: rem-calc(13);
+    font-weight: bold;
     line-height: rem-calc(22);
     margin-bottom: rem-calc(8);
-    padding: 0 rem-calc(6);
+    padding: 0 rem-calc(8);
 
     &:hover {
       color: $link;
       cursor: pointer;
       background: #E5F1F8;
-      border: 1px solid $brand;
     }
   }
 }
@@ -742,6 +776,10 @@ form {
     background: $input-bg;
     height: rem-calc(48);
     margin-bottom: rem-calc(16);
+
+    &.error {
+      margin-bottom: rem-calc(1);
+    }
   }
 
   input[type="checkbox"] + label,
@@ -834,6 +872,22 @@ form {
   width: 100%;
 }
 
+span.error, small.error {
+  background: $alert-bg;
+  color: $alert-color;
+}
+
+.error small.error {
+  background: $alert-bg;
+  color: $alert-color;
+  display: inline-block;
+  margin: 0 rem-calc(6);
+}
+
+label.error, label.error a {
+  color: $alert-color;
+}
+
 // 10. User account
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -1148,7 +1202,7 @@ table {
 
 .page {
   background: white;
-  min-height: rem-calc(600);
+  padding-bottom: rem-calc(48);
 
   .menu {
     margin-top: rem-calc(24);
@@ -1282,8 +1336,8 @@ table {
   }
 
   .verification-step {
-    font-size: rem-calc(11);
-    padding-top: rem-calc(10);
+    font-size: rem-calc(12);
+    padding-top: rem-calc(6);
 
     @media (min-width: $small-breakpoint) {
       line-height: $line-height;
diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb
index 41ae068c0..1d7ecaf7e 100644
--- a/app/views/account/show.html.erb
+++ b/app/views/account/show.html.erb
@@ -44,13 +44,17 @@
           <h2><%= t("account.show.notifications")%></h2>
 
           <div>
-            <%= f.check_box :email_on_debate_comment, label: false %>
-            <span class="checkbox"><%= t("account.show.email_on_debate_comment_label") %></span>
+            <%= f.label :email_on_debate_comment do %>
+              <%= f.check_box :email_on_debate_comment, label: false %>
+              <span class="checkbox"><%= t("account.show.email_on_debate_comment_label") %></span>
+            <% end %>
           </div>
 
           <div>
-            <%= f.check_box :email_on_comment_reply, label: false %>
-            <span class="checkbox"><%= t("account.show.email_on_comment_reply_label") %></span>
+            <%= f.label :email_on_comment_reply do %>
+              <%= f.check_box :email_on_comment_reply, label: false %>
+              <span class="checkbox"><%= t("account.show.email_on_comment_reply_label") %></span>
+            <% end %>
           </div>
         </div>
 
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index cd64b3819..c474e97bf 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -1,10 +1,10 @@
 <section role="main">
 
   <div class="filters row">
-    <div class="small-9 column">
+    <div class="small-12 medium-9 column">
 
       <% if @tag_filter %>
-        <div class="inline-block small-8" >
+        <div class="inline-block small-12 medium-8" >
             <h2>
               <%= t("debates.index.filter_topic",
                      count: @debates.size,
@@ -14,13 +14,15 @@
       <% end %>
 
       <div class="inline-block <%= 'right' if @tag_filter %>">
-        <h6 class="inline-block">
           <% if @tag_filter %>
-            <%= t("debates.index.select_order") %>
+            <h6 class="inline-block">
+              <%= t("debates.index.select_order") %>
+            </h6>
           <% else %>
-            <%= t("debates.index.select_order_long") %>
+            <h2 class="inline-block">
+              <%= t("debates.index.select_order_long") %>
+            </h2>
           <% end %>
-        </h6>
         <form class="inline-block">
            <select class="js-location-changer" name="order-selector">
              <% @valid_orders.each do |order| %>
diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb
index 1e29894c4..3ed8b3a9d 100644
--- a/app/views/debates/show.html.erb
+++ b/app/views/debates/show.html.erb
@@ -4,7 +4,7 @@
       <i class="icon-angle-left left"></i>&nbsp;<%= link_to t("debates.show.back_link"), debates_path, class: 'left back' %>
 
       <% if current_user && @debate.editable_by?(current_user) %>
-        <%= link_to edit_debate_path(@debate), :class => 'right' do %>
+        <%= link_to edit_debate_path(@debate), :class => 'edit-debate button success tiny radius right' do %>
           <i class="icon-edit"></i>
           <%= t("debates.show.edit_debate_link") %>
         <% end %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 0e72ed0d2..38be680e9 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -29,10 +29,8 @@
 
       <section class="subnavigation row text-center">
         <%#= link_to t("layouts.header.welcome"), root_path %>
-        <%= link_to t("layouts.header.debates"), debates_path, class: ("active" if current_page?(controller: "/debates")) %>
         <%#= link_to t("layouts.header.initiatives"), "#" %>
-        <%= link_to t("layouts.header.more_information"), "/more_information", class: ("active" if current_page?("/more_information"))  %>
-        <%= link_to t("layouts.header.external_link_blog"), t("layouts.header.external_link_blog_url"), target: "_blank" %>
+        <%= link_to t("layouts.header.debates"), debates_path, class: ("active" if current_page?(controller: "/debates")) %><%= link_to t("layouts.header.more_information"), "/more_information", class: ("active" if current_page?("/more_information"))  %><%= link_to t("layouts.header.external_link_blog"), t("layouts.header.external_link_blog_url"), target: "_blank" %>
       </section>
     </nav>
   </div>
@@ -65,7 +63,7 @@
 
         <%= link_to "Ir al Portal de Transparencia existente anteriormente", t("layouts.header.external_link_transparency_url"), target: "_blank", class: "button radius" %>
 
-        <p>Mientras acabamos el nuevo portal, te invitamos a visitar el <a href="http://diario.madrid.es/participa/" target="_blank">blog del Área de Participación Ciudadana, Transparencia y Gobierno Abierto</a> para conocer nuestros avances y novedades; o la <a href="/">sección de Participación Ciudadana</a> donde poder decidir qué ciudad es la que quieres.</p>
+        <p>Mientras acabamos el nuevo portal, te invitamos a visitar el <a href="http://diario.madrid.es/" target="_blank">blog del Área de Participación Ciudadana, Transparencia y Gobierno Abierto</a> para conocer nuestros avances y novedades; o la <a href="/">sección de Participación Ciudadana</a> donde poder decidir qué ciudad es la que quieres.</p>
       </div>
       </div>
     </div>
@@ -81,7 +79,7 @@
 
         <%= link_to "Ir al Portal de Datos Abiertos existente anteriormente", t("layouts.header.external_link_opendata_url"), target: "_blank", class: "button radius" %>
 
-        <p>Mientras acabamos el nuevo portal, te invitamos a visitar el <a href="http://diario.madrid.es/participa/" target="_blank">blog del Área de Participación Ciudadana, Transparencia y Gobierno Abierto</a> para conocer nuestros avances y novedades; o la <a href="/">sección de Participación Ciudadana</a> donde poder decidir qué ciudad es la que quieres.</p>
+        <p>Mientras acabamos el nuevo portal, te invitamos a visitar el <a href="http://diario.madrid.es/" target="_blank">blog del Área de Participación Ciudadana, Transparencia y Gobierno Abierto</a> para conocer nuestros avances y novedades; o la <a href="/">sección de Participación Ciudadana</a> donde poder decidir qué ciudad es la que quieres.</p>
       </div>
     </div>
   <% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index d04b2553d..585064bba 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,30 +1,41 @@
 <!DOCTYPE html>
 <html lang="es">
-    <head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-        <title><%= content_for?(:title) ? yield(:title) : "Participación" %></title>
-        <%= stylesheet_link_tag    "application" %>
-        <%= javascript_include_tag "vendor/modernizr" %>
-        <%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
-        <%= csrf_meta_tags %>
-        <%= favicon_link_tag "favicon.ico" %>
+    <title><%= content_for?(:title) ? yield(:title) : "Participación" %></title>
+    <%= stylesheet_link_tag    "application" %>
+    <%= javascript_include_tag "vendor/modernizr" %>
+    <%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
+    <%= csrf_meta_tags %>
+    <%= favicon_link_tag "favicon.ico" %>
     </head>
   <body class="<%= "bg-white" if current_page?(root_path) %>">
+    <div class="wrapper">
+      <%= render 'layouts/header' %>
 
-    <%= render 'layouts/header' %>
+      <% if notice %>
+        <div class="alert-box success alert-layout">
+          <div class="row">
+            <%= notice %>
+          </div>
+        </div>
+      <% end %>
 
-    <% if notice %>
-        <p class="alert-box success alert-layout"><%= notice %></p>
-    <% end %>
+      <% if alert %>
+        <div class="alert-box alert alert-layout">
+          <div class="row">
+            <%= alert %>
+          </div>
+        </div>
+      <% end %>
 
-    <% if alert %>
-        <p class="alert-box alert alert-layout"><%= alert %></p>
-    <% end %>
-
-    <%= yield %>
-
-    <%= render 'layouts/footer' %>
+      <%= yield %>
+      <div class="push"></div>
+    </div>
+    <div class="footer">
+      <%= render 'layouts/footer' %>
+    </div>
   </body>
 </html>
diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb
index 208a6fa3b..c346ecaa3 100644
--- a/app/views/layouts/devise.html.erb
+++ b/app/views/layouts/devise.html.erb
@@ -15,11 +15,19 @@
   <body class="auth-page">
 
     <% if notice %>
-        <p class="alert-box success alert-layout"><%= notice %></p>
+      <div class="alert-box success alert-layout">
+        <div class="row">
+          <%= notice %>
+        </div>
+      </div>
     <% end %>
 
     <% if alert %>
-        <p class="alert-box alert alert-layout"><%= alert %></p>
+      <div class="alert-box alert alert-layout">
+        <div class="row">
+          <%= alert %>
+        </div>
+      </div>
     <% end %>
 
     <div class="row">
diff --git a/app/views/pages/census_terms.html.erb b/app/views/pages/census_terms.html.erb
index c13d97004..0c9e6e15c 100644
--- a/app/views/pages/census_terms.html.erb
+++ b/app/views/pages/census_terms.html.erb
@@ -1,6 +1,6 @@
-<div class="row-full page">
+<div class="page row-full">
   <div class="row">
-    <div class="small-12 column">
+    <div class="text small-12 column">
       <%= simple_format t('pages.census_terms') %>
     </div>
   </div>
diff --git a/app/views/pages/participation.html.erb b/app/views/pages/participation.html.erb
index 18a6a954b..81abb993f 100644
--- a/app/views/pages/participation.html.erb
+++ b/app/views/pages/participation.html.erb
@@ -22,7 +22,7 @@
 
         <p>El nuevo gobierno del Ayuntamiento de Madrid ha creado un nuevo área de gobierno: Participación Ciudadana, Transparencia y Gobierno Abierto. El objetivo de este área es claro: que los madrileños puedan decidir directamente la política de la ciudad, y que todo lo que ocurra en el Ayuntamiento, hasta el último rincón, esté a la vista de todos.</p>
 
-        <p>Iremos publicando nuestros avances, las novedades y cualquier otra cosa que queramos compartir con vosotros en <a href="http://diario.madrid.es/participa/" target="_blank">nuestro blog</a>.</p>
+        <p>Iremos publicando nuestros avances, las novedades y cualquier otra cosa que queramos compartir con vosotros en <a href="http://diario.madrid.es/" target="_blank">nuestro blog</a>.</p>
 
         <p>Y podéis escribirnos para cualquier cosa a la dirección <a href="mailto:ag.gobiernoabierto@madrid.es">ag.gobiernoabierto@madrid.es</a></p>
 
diff --git a/app/views/verification/letter/edit.html.erb b/app/views/verification/letter/edit.html.erb
index 56b76caa5..ed710cb3c 100644
--- a/app/views/verification/letter/edit.html.erb
+++ b/app/views/verification/letter/edit.html.erb
@@ -19,7 +19,12 @@
 
     <div class="small-12 medium-12 column">
 
-      <h1 class="inline-block"><%= t("verification.letter.edit.title") %></h1>
+      <%= link_to account_path, class: "left back clear" do %>
+        <i class="icon-angle-left left"></i>
+        <%= t("verification.back") %>
+      <% end %>
+
+      <h1><%= t("verification.letter.edit.title") %></h1>
 
       <div class="small-12 medium-6">
         <%= form_for @letter, as: "letter", url: letter_path, method: :put do |f| %>
diff --git a/app/views/verification/letter/new.html.erb b/app/views/verification/letter/new.html.erb
index 33b1f97cd..643204a32 100644
--- a/app/views/verification/letter/new.html.erb
+++ b/app/views/verification/letter/new.html.erb
@@ -19,7 +19,12 @@
 
     <div class="small-12 medium-12 column">
 
-      <h1 class="inline-block"><%= t("verification.letter.new.title") %></h1>
+      <%= link_to account_path, class: "left back clear" do %>
+        <i class="icon-angle-left left"></i>
+        <%= t("verification.back") %>
+      <% end %>
+
+      <h1><%= t("verification.letter.new.title") %></h1>
 
       <%= t("verification.letter.new.explanation_html") %>
 
diff --git a/app/views/verification/residence/new.html.erb b/app/views/verification/residence/new.html.erb
index 382db555e..b66e5b179 100644
--- a/app/views/verification/residence/new.html.erb
+++ b/app/views/verification/residence/new.html.erb
@@ -17,7 +17,12 @@
       <span class="meter" style="width: 33%"></span>
     </div>
 
-    <h1 class="inline-block"><%= t("verification.residence.new.title") %></h1>
+    <%= link_to account_path, class: "left back clear" do %>
+      <i class="icon-angle-left left"></i>
+      <%= t("verification.back") %>
+    <% end %>
+
+    <h1><%= t("verification.residence.new.title") %></h1>
 
     <%= form_for @residence, as: "residence", url: residence_path do |f| %>
       <%= render "errors" %>
@@ -47,8 +52,8 @@
       </div>
 
       <div class="small-12">
-        <%= f.check_box :terms_of_service, label: false %>
         <%= f.label :terms_of_service do %>
+          <%= f.check_box :terms_of_service, label: false %>
           <%= t("verification.residence.new.accept_terms_text",
               terms_url: link_to(t("verification.residence.new.terms"), "/census_terms",
               target: "_blank")).html_safe
diff --git a/app/views/verification/sms/edit.html.erb b/app/views/verification/sms/edit.html.erb
index b884c487e..78babe34f 100644
--- a/app/views/verification/sms/edit.html.erb
+++ b/app/views/verification/sms/edit.html.erb
@@ -17,7 +17,12 @@
       <span class="meter" style="width: 66%"></span>
     </div>
 
-    <h1 class="inline-block"><%= t("verification.sms.edit.title") %></h1>
+    <%= link_to account_path, class: "left back clear" do %>
+      <i class="icon-angle-left left"></i>
+      <%= t("verification.back") %>
+    <% end %>
+
+    <h1><%= t("verification.sms.edit.title") %></h1>
 
     <%= form_for @sms, as: "sms", url: sms_path, method: :put do |f| %>
       <% if @error %>
diff --git a/app/views/verification/sms/new.html.erb b/app/views/verification/sms/new.html.erb
index b52d8db34..775c213fd 100644
--- a/app/views/verification/sms/new.html.erb
+++ b/app/views/verification/sms/new.html.erb
@@ -17,7 +17,12 @@
       <span class="meter" style="width: 66%"></span>
     </div>
 
-    <h1 class="inline-block"><%= t("verification.sms.new.title") %></h1>
+    <%= link_to account_path, class: "left back clear" do %>
+      <i class="icon-angle-left left"></i>
+      <%= t("verification.back") %>
+    <% end %>
+
+    <h1><%= t("verification.sms.new.title") %></h1>
 
     <%= form_for @sms, as: "sms", url: sms_path do |f| %>
       <%= render "shared/errors", resource: @sms %>
diff --git a/app/views/verification/verified_user/show.html.erb b/app/views/verification/verified_user/show.html.erb
index 24569f3f9..2193e4fcd 100644
--- a/app/views/verification/verified_user/show.html.erb
+++ b/app/views/verification/verified_user/show.html.erb
@@ -1,7 +1,12 @@
 <div class="verification account row">
   <div class="small-12 column">
 
-    <h1 class="inline-block"><%= t("verification.verified_user.show.title") %></h1>
+    <%= link_to account_path, class: "left back clear" do %>
+      <i class="icon-angle-left left"></i>
+      <%= t("verification.back") %>
+    <% end %>
+
+    <h1><%= t("verification.verified_user.show.title") %></h1>
 
     <p><%= t("verification.verified_user.show.explanation") %></p>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c4583ffd8..7a4be1323 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -7,7 +7,7 @@ en:
       external_link_opendata: Open data
       external_link_opendata_url: "http://datos.madrid.es"
       external_link_blog: Blog
-      external_link_blog_url: "http://diario.madrid.es/participa/"
+      external_link_blog_url: "http://diario.madrid.es/"
       open_gov: "%{open} government"
       open: "Open"
       participation: Participation
@@ -56,7 +56,7 @@ en:
       error: error
       errors: errors
       not_saved: "prohibited this %{resource} from being saved:"
-      accept_terms: I accept the privacy policy and the legal terms
+      accept_terms: "I accept the Privacy policy and the Terms of use"
       user: account
       debate: debate
       verification::sms: phone
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 62ab28997..10351fe3a 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -7,7 +7,7 @@ es:
       external_link_opendata: Datos abiertos
       external_link_opendata_url: "http://datos.madrid.es"
       external_link_blog: Blog
-      external_link_blog_url: "http://diario.madrid.es/participa/"
+      external_link_blog_url: "http://diario.madrid.es/"
       open_gov: "Gobierno %{open}"
       open: "abierto"
       participation: Participación
@@ -56,7 +56,7 @@ es:
       error: error
       errors: errores
       not_saved: "impidieron guardar %{resource}:"
-      accept_terms: Acepto la política de privacidad y el aviso legal
+      accept_terms: "Acepto la Política de privacidad y las Condiciones de uso"
       user: la cuenta
       debate: el debate
       verification::sms: el teléfono
diff --git a/config/locales/verification.en.yml b/config/locales/verification.en.yml
index 1588d3713..bcc818d97 100644
--- a/config/locales/verification.en.yml
+++ b/config/locales/verification.en.yml
@@ -1,5 +1,6 @@
 en:
   verification:
+    back: "Back to my account"
     step_1: "1. Residence"
     step_2: "2. Confirmation code"
     step_3: "3. Final verification"
diff --git a/config/locales/verification.es.yml b/config/locales/verification.es.yml
index 5da534899..75442af5d 100644
--- a/config/locales/verification.es.yml
+++ b/config/locales/verification.es.yml
@@ -1,5 +1,6 @@
 es:
   verification:
+    back: "Volver a mi cuenta"
     step_1: "1. Residencia"
     step_2: "2. Código de confirmación"
     step_3: "3. Verificación final"