diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss
index e405fb023..bd8759c98 100644
--- a/app/assets/stylesheets/participacion.scss
+++ b/app/assets/stylesheets/participacion.scss
@@ -16,6 +16,7 @@
 // 14. Tables
 // 15. Social
 // 16. Pages
+// 17. Verification
 //
 
 // 01. Variables
@@ -126,6 +127,7 @@ h6 {
 }
 
 .button {
+  font-size: rem-calc(13);
   padding: rem-calc(15) rem-calc(32);
 }
 
@@ -221,6 +223,11 @@ h6 {
   }
 }
 
+.progress {
+  background-color: rgba(0,0,0,.06);
+  border: 0;
+}
+
 // 04. Header
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -866,22 +873,8 @@ form {
     margin-right: rem-calc(12);
   }
 
-  .date {
-
-    select {
-      float: left;
-      width: 25%;
-    }
-  }
-
   .verify-account {
     padding-right: rem-calc(12);
-
-    .verified {
-      color: $check;
-      font-weight: bold;
-      line-height: rem-calc(42);
-    }
   }
 }
 
@@ -1180,3 +1173,92 @@ table {
     }
   }
 }
+
+// 17. Verification
+// - - - - - - - - - - - - - - - - - - - - - - - - -
+
+.verification {
+  min-height: 60%;
+
+  @media (min-width: $small-breakpoint) {
+    .left + .left {
+      margin-left: rem-calc(12);
+    }
+  }
+
+  .verify-account {
+    padding-right: rem-calc(12);
+
+    .verified {
+      color: $check;
+      font-weight: bold;
+      line-height: rem-calc(42);
+    }
+  }
+
+  .date {
+
+    select {
+      float: left;
+      width: 30%;
+
+      @media (min-width: $small-breakpoint) {
+        width: 25%;
+      }
+    }
+  }
+
+  .progress {
+    height: rem-calc(48);
+
+    @media (min-width: $small-breakpoint) {
+      height: rem-calc(24);
+    }
+
+    .meter {
+      background: #63D1C4;
+    }
+  }
+
+  .verification-step {
+    font-size: rem-calc(11);
+    padding-top: rem-calc(10);
+
+    @media (min-width: $small-breakpoint) {
+      line-height: $line-height;
+      padding-top: 0;
+    }
+
+    &.active {
+      color: white;
+    }
+
+    &.completed {
+      color: rgba(255,255,255,.5);
+    }
+  }
+
+  .send-letter {
+    background: none;
+    color: $link;
+
+    &:hover {
+      color: $link-hover;
+    }
+  }
+
+  .button + form {
+    display: inline-block;
+    margin-left: rem-calc(12);
+  }
+
+  .verification-list {
+    font-size: rem-calc(13);
+    list-style-type: none;
+    margin-left: 0;
+
+    span {
+      display: inline-block;
+    }
+  }
+}
diff --git a/app/controllers/admin/comments_controller.rb b/app/controllers/admin/comments_controller.rb
index 40f9b31dc..0399ccd63 100644
--- a/app/controllers/admin/comments_controller.rb
+++ b/app/controllers/admin/comments_controller.rb
@@ -1,11 +1,11 @@
 class Admin::CommentsController < Admin::BaseController
-  before_filter :set_valid_filters, only: :index
-  before_filter :parse_filter, only: :index
+
+  has_filters %w{all with_confirmed_hide}
 
   before_filter :load_comment, only: [:confirm_hide, :restore]
 
   def index
-    @comments = Comment.only_hidden.send(@filter).page(params[:page])
+    @comments = Comment.only_hidden.send(@current_filter).page(params[:page])
   end
 
   def confirm_hide
@@ -23,13 +23,4 @@ class Admin::CommentsController < Admin::BaseController
       @comment = Comment.with_hidden.find(params[:id])
     end
 
-    def set_valid_filters
-      @valid_filters = %w{all with_confirmed_hide}
-    end
-
-    def parse_filter
-      @filter = params[:filter]
-      @filter = 'all' unless @valid_filters.include?(@filter)
-    end
-
 end
diff --git a/app/controllers/admin/debates_controller.rb b/app/controllers/admin/debates_controller.rb
index 4487fcf81..23edb01f5 100644
--- a/app/controllers/admin/debates_controller.rb
+++ b/app/controllers/admin/debates_controller.rb
@@ -1,11 +1,10 @@
 class Admin::DebatesController < Admin::BaseController
-  before_filter :set_valid_filters, only: :index
-  before_filter :parse_filter, only: :index
+  has_filters %w{all with_confirmed_hide}, only: :index
 
   before_filter :load_debate, only: [:confirm_hide, :restore]
 
   def index
-    @debates = Debate.only_hidden.send(@filter).page(params[:page])
+    @debates = Debate.only_hidden.send(@current_filter).page(params[:page])
   end
 
   def confirm_hide
@@ -24,13 +23,4 @@ class Admin::DebatesController < Admin::BaseController
       @debate = Debate.with_hidden.find(params[:id])
     end
 
-    def set_valid_filters
-      @valid_filters = %w{all with_confirmed_hide}
-    end
-
-    def parse_filter
-      @filter = params[:filter]
-      @filter = 'all' unless @valid_filters.include?(@filter)
-    end
-
 end
diff --git a/app/controllers/admin/organizations_controller.rb b/app/controllers/admin/organizations_controller.rb
index bb623702a..0e704e9a1 100644
--- a/app/controllers/admin/organizations_controller.rb
+++ b/app/controllers/admin/organizations_controller.rb
@@ -1,11 +1,11 @@
 class Admin::OrganizationsController < Admin::BaseController
-  before_filter :set_valid_filters, only: :index
-  before_filter :parse_filter, only: :index
+
+  has_filters %w{all pending verified rejected}, only: :index
 
   load_and_authorize_resource except: :search
 
   def index
-    @organizations = @organizations.send(@filter)
+    @organizations = @organizations.send(@current_filter)
     @organizations = @organizations.includes(:user).order(:name, 'users.email').page(params[:page])
   end
 
@@ -23,14 +23,4 @@ class Admin::OrganizationsController < Admin::BaseController
     redirect_to request.query_parameters.merge(action: :index)
   end
 
-  private
-    def set_valid_filters
-      @valid_filters = %w{all pending verified rejected}
-    end
-
-    def parse_filter
-      @filter = params[:filter]
-      @filter = 'all' unless @valid_filters.include?(@filter)
-    end
-
 end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 61c0f5650..ecf7f206a 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -1,11 +1,11 @@
 class Admin::UsersController < Admin::BaseController
-  before_filter :set_valid_filters, only: :index
-  before_filter :parse_filter, only: :index
+
+  has_filters %w{all with_confirmed_hide}, only: :index
 
   before_filter :load_user, only: [:confirm_hide, :restore]
 
   def index
-    @users = User.only_hidden.send(@filter).page(params[:page])
+    @users = User.only_hidden.send(@current_filter).page(params[:page])
   end
 
   def show
@@ -30,13 +30,4 @@ class Admin::UsersController < Admin::BaseController
       @user = User.with_hidden.find(params[:id])
     end
 
-    def set_valid_filters
-      @valid_filters = %w{all with_confirmed_hide}
-    end
-
-    def parse_filter
-      @filter = params[:filter]
-      @filter = 'all' unless @valid_filters.include?(@filter)
-    end
-
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5d207e463..86219f0ad 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,6 +1,8 @@
 require "application_responder"
 
 class ApplicationController < ActionController::Base
+  include HasFilters
+
   before_filter :authenticate_http_basic
 
   before_filter :authenticate_user!, unless: :devise_controller?, if: :beta_site?
diff --git a/app/controllers/concerns/has_filters.rb b/app/controllers/concerns/has_filters.rb
new file mode 100644
index 000000000..3dd3cc295
--- /dev/null
+++ b/app/controllers/concerns/has_filters.rb
@@ -0,0 +1,13 @@
+module HasFilters
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def has_filters(valid_filters, *args)
+      before_filter(*args) do
+        @valid_filters = valid_filters
+        @current_filter = params[:filter]
+        @current_filter = @valid_filters.first unless @valid_filters.include?(@current_filter)
+      end
+    end
+  end
+end
diff --git a/app/controllers/moderation/comments_controller.rb b/app/controllers/moderation/comments_controller.rb
index 3622d02ac..065516531 100644
--- a/app/controllers/moderation/comments_controller.rb
+++ b/app/controllers/moderation/comments_controller.rb
@@ -1,12 +1,12 @@
 class Moderation::CommentsController < Moderation::BaseController
-  before_filter :set_valid_filters, only: :index
-  before_filter :parse_filter, only: :index
+
+  has_filters %w{all pending_flag_review with_ignored_flag}, only: :index
   before_filter :load_comments, only: :index
 
   load_and_authorize_resource
 
   def index
-    @comments = @comments.send(@filter)
+    @comments = @comments.send(@current_filter)
     @comments = @comments.page(params[:page])
   end
 
@@ -30,13 +30,4 @@ class Moderation::CommentsController < Moderation::BaseController
       @comments = Comment.accessible_by(current_ability, :hide).flagged.sorted_for_moderation.includes(:commentable)
     end
 
-    def set_valid_filters
-      @valid_filters = %w{all pending_flag_review with_ignored_flag}
-    end
-
-    def parse_filter
-      @filter = params[:filter]
-      @filter = 'all' unless @valid_filters.include?(@filter)
-    end
-
 end
diff --git a/app/controllers/moderation/debates_controller.rb b/app/controllers/moderation/debates_controller.rb
index abb8e964b..5fdd19049 100644
--- a/app/controllers/moderation/debates_controller.rb
+++ b/app/controllers/moderation/debates_controller.rb
@@ -1,13 +1,13 @@
 class Moderation::DebatesController < Moderation::BaseController
-  before_filter :set_valid_filters, only: :index
-  before_filter :parse_filter, only: :index
+
+  has_filters %w{all pending_flag_review with_ignored_flag}, only: :index
+
   before_filter :load_debates, only: :index
 
   load_and_authorize_resource
 
   def index
-    @debates = @debates.send(@filter)
-    @debates = @debates.page(params[:page])
+    @debates = @debates.send(@current_filter).page(params[:page])
   end
 
   def hide
@@ -30,13 +30,4 @@ class Moderation::DebatesController < Moderation::BaseController
       @debates = Debate.accessible_by(current_ability, :hide).flagged.sorted_for_moderation
     end
 
-    def set_valid_filters
-      @valid_filters = %w{all pending_flag_review with_ignored_flag}
-    end
-
-    def parse_filter
-      @filter = params[:filter]
-      @filter = 'all' unless @valid_filters.include?(@filter)
-    end
-
 end
diff --git a/app/controllers/verification/letter_controller.rb b/app/controllers/verification/letter_controller.rb
index 401ae0ed2..152590b20 100644
--- a/app/controllers/verification/letter_controller.rb
+++ b/app/controllers/verification/letter_controller.rb
@@ -26,7 +26,7 @@ class Verification::LetterController < ApplicationController
 
     def verify_phone_or_email!
       unless current_user.confirmed_phone?
-        redirect_to verified_user_path, alert: t('verification.letter.alert.unconfirmed_personal_data')
+        redirect_to verified_user_path, alert: t('verification.letter.alert.unconfirmed_code')
       end
     end
 end
\ No newline at end of file
diff --git a/app/models/debate.rb b/app/models/debate.rb
index e088d8141..9c96c812c 100644
--- a/app/models/debate.rb
+++ b/app/models/debate.rb
@@ -75,7 +75,9 @@ class Debate < ActiveRecord::Base
   end
 
   def votable_by?(user)
-    !user.unverified? ||
+    total_votes <= 100 ||
+      !user.unverified? ||
+      Setting.value_for('max_ratio_anon_votes_on_debates').to_i == 100 ||
       anonymous_votes_ratio < Setting.value_for('max_ratio_anon_votes_on_debates').to_i ||
       user.voted_for?(self)
   end
diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb
index bf749bbd2..41ae068c0 100644
--- a/app/views/account/show.html.erb
+++ b/app/views/account/show.html.erb
@@ -1,21 +1,26 @@
 <div class="row account">
   <div class="small-12 column">
-    <%= link_to t("account.show.change_credentials_link"), edit_user_registration_path, class: 'button radius small secondary right' %>
+    <%= link_to t("account.show.change_credentials_link"), edit_user_registration_path, class: "button radius small secondary right" %>
 
-    <span class="right verify-account">
-      <% if current_user.level_three_verified? %>
-        <p class="verified"><%= t("account.show.level_three_user") %></p>
-      <% elsif current_user.level_two_verified? %>
-        <p class="verified"><%= t("account.show.level_two_user") %></p>
-      <% else %>
-        <%= link_to t("account.show.verify_my_account"), new_residence_path, class: 'button radius small success right' %>
-      <% end %>
-    </span>
+    <div class="verification">
+      <span class="right verify-account">
+        <% if current_user.level_three_verified? %>
+          <p class="verified">
+            <i class="icon-check"></i>
+            <%= t("account.show.verified_account") %>
+          </p>
+        <% elsif current_user.level_two_verified? %>
+          <%= link_to t("account.show.finish_verification"), new_letter_path, class: "button radius small success right" %>
+        <% else %>
+          <%= link_to t("account.show.verify_my_account"), new_residence_path, class: "button radius small success right" %>
+        <% end %>
+      </span>
+    </div>
 
     <h1 class="inline-block"><%= t("account.show.title") %></h1>
 
     <%= form_for @account, as: :account, url: account_path do |f| %>
-      <%= render 'shared/errors', resource: @account %>
+      <%= render "shared/errors", resource: @account %>
 
       <div class="row">
         <div class="small-12 column">
diff --git a/app/views/admin/comments/index.html.erb b/app/views/admin/comments/index.html.erb
index 87178c66b..f0639047f 100644
--- a/app/views/admin/comments/index.html.erb
+++ b/app/views/admin/comments/index.html.erb
@@ -1,17 +1,6 @@
 <h2><%= t("admin.comments.index.title") %></h2>
 
-<dl class="sub-nav">
-  <dt><%= t("admin.comments.index.filter") %>:</dt>
-
-  <% @valid_filters.each do |filter| %>
-    <% if @filter == filter %>
-      <dd class="active"><%= t("admin.comments.index.filters.#{filter}") %></dd>
-    <% else %>
-      <dd><%= link_to t("admin.comments.index.filters.#{filter}"),
-        current_path_with_query_params(filter: filter) %></dd>
-    <% end %>
-  <% end %>
-</dl>
+<%= render 'shared/filter_subnav', i18n_namespace: "admin.comments.index" %>
 
 <h3><%= page_entries_info @comments %></h3>
 
diff --git a/app/views/admin/debates/index.html.erb b/app/views/admin/debates/index.html.erb
index 9ac89b5e1..7caa8ecc3 100644
--- a/app/views/admin/debates/index.html.erb
+++ b/app/views/admin/debates/index.html.erb
@@ -1,17 +1,6 @@
 <h2><%= t("admin.debates.index.title") %></h2>
 
-<dl class="sub-nav">
-  <dt><%= t("admin.debates.index.filter") %>:</dt>
-
-  <% @valid_filters.each do |filter| %>
-    <% if @filter == filter %>
-      <dd class="active"><%= t("admin.debates.index.filters.#{filter}") %></dd>
-    <% else %>
-      <dd><%= link_to t("admin.debates.index.filters.#{filter}"),
-        current_path_with_query_params(filter: filter) %></dd>
-    <% end %>
-  <% end %>
-</dl>
+<%= render 'shared/filter_subnav', i18n_namespace: "admin.debates.index" %>
 
 <h3><%= page_entries_info @debates %></h3>
 
diff --git a/app/views/admin/organizations/index.html.erb b/app/views/admin/organizations/index.html.erb
index 524d65a68..464168746 100644
--- a/app/views/admin/organizations/index.html.erb
+++ b/app/views/admin/organizations/index.html.erb
@@ -13,18 +13,7 @@
 <% end %>
 <!-- /. Search organizations -->
 
-<dl class="sub-nav">
-  <dt><%= t("admin.organizations.index.filter") %>:</dt>
-
-  <% @valid_filters.each do |filter| %>
-    <% if @filter == filter %>
-      <dd class="active"><%= t("admin.organizations.index.filters.#{filter}") %></dd>
-    <% else %>
-      <dd><%= link_to t("admin.organizations.index.filters.#{filter}"),
-        current_path_with_query_params(filter: filter) %></dd>
-    <% end %>
-  <% end %>
-</dl>
+<%= render 'shared/filter_subnav', i18n_namespace: "admin.organizations.index" %>
 
 <h3><%= page_entries_info @organizations %></h3>
 
diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb
index b6f3f1cfe..0d18c8b61 100644
--- a/app/views/admin/users/index.html.erb
+++ b/app/views/admin/users/index.html.erb
@@ -1,17 +1,6 @@
 <h2><%= t("admin.users.index.title") %></h2>
 
-<dl class="sub-nav">
-  <dt><%= t("admin.users.index.filter") %>:</dt>
-
-  <% @valid_filters.each do |filter| %>
-    <% if @filter == filter %>
-      <dd class="active"><%= t("admin.users.index.filters.#{filter}") %></dd>
-    <% else %>
-      <dd><%= link_to t("admin.users.index.filters.#{filter}"),
-        current_path_with_query_params(filter: filter) %></dd>
-    <% end %>
-  <% end %>
-</dl>
+<%= render 'shared/filter_subnav', i18n_namespace: "admin.users.index" %>
 
 <h3><%= page_entries_info @users %></h3>
 
diff --git a/app/views/moderation/comments/index.html.erb b/app/views/moderation/comments/index.html.erb
index da2bb8251..ec642077b 100644
--- a/app/views/moderation/comments/index.html.erb
+++ b/app/views/moderation/comments/index.html.erb
@@ -1,17 +1,6 @@
 <h2><%= t("moderation.comments.index.title") %></h2>
 
-<dl class="sub-nav">
-  <dt><%= t("moderation.comments.index.filter") %>:</dt>
-
-  <% @valid_filters.each do |filter| %>
-    <% if @filter == filter %>
-      <dd class="active"><%= t("moderation.comments.index.filters.#{filter}") %></dd>
-    <% else %>
-      <dd><%= link_to t("moderation.comments.index.filters.#{filter}"),
-        current_path_with_query_params(filter: filter) %></dd>
-    <% end %>
-  <% end %>
-</dl>
+<%= render 'shared/filter_subnav', i18n_namespace: "moderation.comments.index" %>
 
 <h3><%= page_entries_info @comments %></h3>
 
diff --git a/app/views/moderation/debates/index.html.erb b/app/views/moderation/debates/index.html.erb
index 8fb013605..3fc3f402b 100644
--- a/app/views/moderation/debates/index.html.erb
+++ b/app/views/moderation/debates/index.html.erb
@@ -1,17 +1,6 @@
 <h2><%= t("moderation.debates.index.title") %></h2>
 
-<dl class="sub-nav">
-  <dt><%= t("moderation.debates.index.filter") %>:</dt>
-
-  <% @valid_filters.each do |filter| %>
-    <% if @filter == filter %>
-      <dd class="active"><%= t("moderation.debates.index.filters.#{filter}") %></dd>
-    <% else %>
-      <dd><%= link_to t("moderation.debates.index.filters.#{filter}"),
-        current_path_with_query_params(filter: filter) %></dd>
-    <% end %>
-  <% end %>
-</dl>
+<%= render 'shared/filter_subnav', i18n_namespace: "moderation.debates.index" %>
 
 <h3><%= page_entries_info @debates %></h3>
 
diff --git a/app/views/shared/_filter_subnav.html.erb b/app/views/shared/_filter_subnav.html.erb
new file mode 100644
index 000000000..0f8975aa3
--- /dev/null
+++ b/app/views/shared/_filter_subnav.html.erb
@@ -0,0 +1,17 @@
+<% # Params:
+   #
+   #   i18n_namespace: for example "moderation.debates.index"
+%>
+
+<dl class="sub-nav">
+  <dt><%= t("#{i18n_namespace}.filter") %>: </dt>
+
+  <% @valid_filters.each do |filter| %>
+    <% if @current_filter == filter %>
+      <dd class="active"><%= t("#{i18n_namespace}.filters.#{filter}") %></dd>
+    <% else %>
+      <dd><%= link_to t("#{i18n_namespace}.filters.#{filter}"),
+        current_path_with_query_params(filter: filter) %></dd>
+    <% end %>
+  <% end %>
+</dl>
diff --git a/app/views/verification/letter/new.html.erb b/app/views/verification/letter/new.html.erb
index 31a82be63..850ec75bf 100644
--- a/app/views/verification/letter/new.html.erb
+++ b/app/views/verification/letter/new.html.erb
@@ -1,15 +1,49 @@
-<div class="row account">
+<div class="verification account row">
   <div class="small-12 column">
 
-    <h1 class="inline-block"><%= t('verification.letter.new.title') %></h1>
+    <div class="text-center">
+      <div class="small-4 column verification-step completed">
+        <%= t("verification.step_1") %>
+      </div>
+      <div class="small-4 column verification-step completed">
+        <%= t("verification.step_2") %>
+      </div>
+      <div class="small-4 column verification-step active">
+        <%= t("verification.step_3") %>
+      </div>
 
-    <div>
-      <%= t('verification.letter.new.explanation') %>
+      <div class="progress small-12 success round">
+        <span class="meter" style="width: 100%"></span>
+      </div>
     </div>
 
-    <%= form_for @letter, as: "letter", url: letter_path do |f| %>
-      <%= render 'shared/errors', resource: @letter %>
-      <%= f.submit t('verification.letter.new.submit_button') %>
-    <% end %>
+    <div class="small-12 medium-12 column">
+
+      <h1 class="inline-block"><%= t("verification.letter.new.title") %></h1>
+
+      <%= t("verification.letter.new.explanation_html") %>
+
+      <%= link_to t("verification.letter.new.offices"), t("verification.letter.new.offices_url"),
+          target: "_blank", class: "button radius inline-block"
+      %>
+
+      <%= form_for @letter, as: "letter", url: letter_path do |f| %>
+        <%= render "shared/errors", resource: @letter %>
+        <%= f.submit t("verification.letter.new.send_letter"), class: "button radius secondary inline-block" %>
+      <% end %>
+
+      <!-- Show this if user clics on 'Send me a letter' -->
+      <div class="alert-box success radius">
+      Gracias por solicitar tu código de máxima seguridad, en unos días te lo enviaremos a la dirección que figura en tus datos del padrón. Recuerda que puedes ahorrar el envío recogiendo tu código en cualquiera de las Oficinas de Atención al Ciudadano.
+      </div>
+      <div class="small-12 medium-6">
+        <%= form_tag do %>
+          <%= label_tag t("verification.letter.new.introduce_code") %>
+          <%= text_field_tag(:q) %>
+          <%= submit_tag t("verification.letter.new.send_code"), class: "button radius success" %>
+        <% end %>
+      </div>
+      <!-- /. Show this if user clics on 'Send me a letter' -->
+    </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/verification/residence/_errors.html.erb b/app/views/verification/residence/_errors.html.erb
index deb3048e8..b8a3529a8 100644
--- a/app/views/verification/residence/_errors.html.erb
+++ b/app/views/verification/residence/_errors.html.erb
@@ -1,12 +1,12 @@
 <% if @residence.errors[:residence_in_madrid].present? %>
 
   <div id="error_explanation" class="alert-box alert radius">
-    <%= t('verification.residence.new.error_verifying_census') %>
+    <%= t("verification.residence.new.error_verifying_census") %>
     <%= mail_to "web.gobiernoabierto@madrid.es" %>
   </div>
 
 <% else %>
-  <%= render 'shared/errors',
+  <%= render "shared/errors",
              resource: @residence,
-             message: t('verification.residence.new.form_errors')  %>
-<% end %>
\ No newline at end of file
+             message: t("verification.residence.new.form_errors")  %>
+<% end %>
diff --git a/app/views/verification/residence/new.html.erb b/app/views/verification/residence/new.html.erb
index 23b88f957..382db555e 100644
--- a/app/views/verification/residence/new.html.erb
+++ b/app/views/verification/residence/new.html.erb
@@ -1,38 +1,64 @@
-<div class="row account">
+<div class="verification account row">
   <div class="small-12 column">
 
-    <h1 class="inline-block"><%= t('verification.residence.new.title') %></h1>
+    <div class="text-center">
+      <div class="small-4 column verification-step active">
+        <%= t("verification.step_1") %>
+      </div>
+      <div class="small-4 column verification-step">
+        <%= t("verification.step_2") %>
+      </div>
+      <div class="small-4 column verification-step">
+        <%= t("verification.step_3") %>
+      </div>
+    </div>
+
+    <div class="progress small-12 success round">
+      <span class="meter" style="width: 33%"></span>
+    </div>
+
+    <h1 class="inline-block"><%= t("verification.residence.new.title") %></h1>
 
     <%= form_for @residence, as: "residence", url: residence_path do |f| %>
-      <%= render 'errors' %>
+      <%= render "errors" %>
 
-      <div class="small-12 medium-6">
-        <div class="small-6 medium-3">
-        <%= f.select :document_type, document_types, prompt: "" %>
+      <div class="small-12 medium-8">
+        <div class="small-12 medium-4 left">
+        <%= f.label t("verification.residence.new.document_type_label") %>
+        <%= f.select :document_type, document_types, prompt: "", label: false %>
         </div>
-        <div class="small-6 medium-8">
-        <%= f.text_field :document_number %>
+        <div class="small-12 medium-5 left">
+        <%= f.label t("verification.residence.new.document_number") %>
+        <%= f.text_field :document_number, label: false %>
         </div>
       </div>
 
-      <div class="date small-12 medium-6">
+      <div class="date small-12 medium-6 clear">
+      <%= f.label t("verification.residence.new.date_of_birth") %>
       <%= f.date_select :date_of_birth,
                         prompt: true,
-                        start_year: 1900, end_year: 16.years.ago.year %>
+                        start_year: 1900, end_year: 16.years.ago.year,
+                        label: false %>
       </div>
 
       <div class="small-12 medium-4 clear">
-        <%= f.text_field :postal_code %>
+        <%= f.label t("verification.residence.new.postal_code") %>
+        <%= f.text_field :postal_code, label: false %>
       </div>
 
       <div class="small-12">
-          <%= f.check_box :terms_of_service, label: t("verification.residence.new.accept_terms_text") %>
-          <%= link_to t("verification.residence.new.accept_terms_link"), '/census_terms', target: "_blank" %>
+        <%= f.check_box :terms_of_service, label: false %>
+        <%= f.label :terms_of_service do %>
+          <%= t("verification.residence.new.accept_terms_text",
+              terms_url: link_to(t("verification.residence.new.terms"), "/census_terms",
+              target: "_blank")).html_safe
+          %>
+        <% end %>
       </div>
 
       <div class="small-12 clear">
-        <%= f.submit "Verify" %>
+        <%= f.submit t("verification.residence.new.verify_residence") %>
       </div>
     <% end %>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/verification/sms/edit.html.erb b/app/views/verification/sms/edit.html.erb
index 7432af7eb..b884c487e 100644
--- a/app/views/verification/sms/edit.html.erb
+++ b/app/views/verification/sms/edit.html.erb
@@ -1,16 +1,38 @@
-<div class="row account">
+<div class="verification account row">
   <div class="small-12 column">
+    <div class="text-center">
 
-    <h1 class="inline-block"><%= t('verification.sms.edit.title') %></h1>
+      <div class="small-4 column verification-step completed">
+        <%= t("verification.step_1") %>
+      </div>
+      <div class="small-4 column verification-step active">
+        <%= t("verification.step_2") %>
+      </div>
+      <div class="small-4 column verification-step">
+        <%= t("verification.step_3") %>
+      </div>
+    </div>
+
+    <div class="progress small-12 success round">
+      <span class="meter" style="width: 66%"></span>
+    </div>
+
+    <h1 class="inline-block"><%= t("verification.sms.edit.title") %></h1>
 
     <%= form_for @sms, as: "sms", url: sms_path, method: :put do |f| %>
-      <p><%= @error %></p>
-      <%= f.text_field :confirmation_code %>
+      <% if @error %>
+        <div class="alert-box alert radius"><%= @error %></div>
+      <% end %>
 
-      <%= f.submit t('verification.sms.edit.submit_button') %>
+      <div class="small-12 medium-6">
+        <%= f.label t("verification.sms.edit.confirmation_code") %>
+        <%= f.text_field :confirmation_code, label: false %>
+      </div>
+
+      <%= f.submit t("verification.sms.edit.submit_button") %>
     <% end %>
 
-    <%= t('verification.sms.edit.resend_sms_text') %>
-    <%= link_to t('verification.sms.edit.resend_sms_link'), verified_user_path %>
+    <%= t("verification.sms.edit.resend_sms_text") %>
+    <%= link_to t("verification.sms.edit.resend_sms_link"), verified_user_path %>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/verification/sms/new.html.erb b/app/views/verification/sms/new.html.erb
index 8050c0f90..b52d8db34 100644
--- a/app/views/verification/sms/new.html.erb
+++ b/app/views/verification/sms/new.html.erb
@@ -1,14 +1,33 @@
-<div class="row account">
+<div class="verification account row">
   <div class="small-12 column">
+    <div class="text-center">
 
-    <h1 class="inline-block"><%= t('verification.sms.new.title') %></h1>
+      <div class="small-4 column verification-step completed">
+        <%= t("verification.step_1") %>
+      </div>
+      <div class="small-4 column verification-step active">
+        <%= t("verification.step_2") %>
+      </div>
+      <div class="small-4 column verification-step">
+        <%= t("verification.step_3") %>
+      </div>
+    </div>
+
+    <div class="progress small-12 success round">
+      <span class="meter" style="width: 66%"></span>
+    </div>
+
+    <h1 class="inline-block"><%= t("verification.sms.new.title") %></h1>
 
     <%= form_for @sms, as: "sms", url: sms_path do |f| %>
-      <%= render 'shared/errors', resource: @sms %>
+      <%= render "shared/errors", resource: @sms %>
 
-      <%= f.text_field :phone %>
+      <div class="small-12 medium-6">
+        <%= f.label t("verification.sms.new.phone") %>
+        <%= f.text_field :phone, label: false %>
+      </div>
 
-      <%= f.submit t('verification.sms.new.submit_button') %>
+      <%= f.submit t("verification.sms.new.submit_button") %>
     <% end %>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/verification/verified_user/_form.html.erb b/app/views/verification/verified_user/_form.html.erb
index 286bb38ba..a19fa6255 100644
--- a/app/views/verification/verified_user/_form.html.erb
+++ b/app/views/verification/verified_user/_form.html.erb
@@ -1,4 +1,4 @@
 <%= form_for verified_user, url: url, method: :post do |f| %>
   <%= f.hidden_field :id %>
-  <%= f.submit t('verification.verified_user.form.submit_button') %>
-<% end %>
\ No newline at end of file
+  <%= f.submit t("verification.verified_user.form.submit_button"), class: "button radius success tiny" %>
+<% end %>
diff --git a/app/views/verification/verified_user/show.html.erb b/app/views/verification/verified_user/show.html.erb
index a5a3915f3..24569f3f9 100644
--- a/app/views/verification/verified_user/show.html.erb
+++ b/app/views/verification/verified_user/show.html.erb
@@ -1,49 +1,41 @@
-<div class="row account">
+<div class="verification account row">
   <div class="small-12 column">
 
-    <h1 class="inline-block"><%= t('verification.verified_user.show.title') %></h1>
+    <h1 class="inline-block"><%= t("verification.verified_user.show.title") %></h1>
+
+    <p><%= t("verification.verified_user.show.explanation") %></p>
 
     <% if @verified_users.map(&:email).any? %>
-      <div><strong><%= t('verification.verified_user.show.email_title') %></strong></div>
-      <ul>
+      <h2><%= t("verification.verified_user.show.email_title") %></h2>
+      <ul class="verification-list">
         <% @verified_users.each do |verified_user| %>
           <% if verified_user.email.present? %>
-            <li id="<%= dom_id(verified_user) %>_email" style="float:left">
-              <span style="float:left">
-                <%= mask_email(verified_user.email) %>
-              </span>
-              <span style="float:left;padding-left:30px">
-                <%= render 'form', url: email_path, verified_user: verified_user %>
-              </span>
+            <li id="<%= dom_id(verified_user) %>_email">
+                <span><%= mask_email(verified_user.email) %></span>
+                <span><%= render "form", url: email_path, verified_user: verified_user %></span>
             </li>
-            <br/><br/><br/>
           <% end %>
         <% end %>
       </ul>
     <% end %>
 
     <% if @verified_users.map(&:phone).any? %>
-      <div><strong><%= t('verification.verified_user.show.phone_title') %></strong></div>
-      <ul style="padding-top:40px">
+      <h2><%= t("verification.verified_user.show.phone_title") %></h2>
+      <ul class="verification-list">
         <% @verified_users.each do |verified_user| %>
           <% if verified_user.phone.present? %>
             <li id="<%= dom_id(verified_user) %>_phone" style="float:left">
-              <span style="float:left">
-                <%= mask_phone(verified_user.phone) %>
-              </span>
-              <span style="float:left;padding-left:30px">
-                <%= render 'form', url: sms_path, verified_user: verified_user %>
-              </span>
+              <span><%= mask_phone(verified_user.phone) %></span>
+              <span><%= render "form", url: sms_path, verified_user: verified_user %></span>
             </li>
-            <br/><br/><br/>
           <% end %>
         <% end %>
       </ul>
     <% end %>
 
-    <div style="margin-top: 30px">
-      <%= link_to t('verification.verified_user.show.use_another_phone'), new_sms_path %>
+    <div class="margin clear">
+      <%= link_to t("verification.verified_user.show.use_another_phone"), new_sms_path %>
     </div>
 
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/config/database.yml.example b/config/database.yml.example
index f09af3a66..f2a9d4f6c 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -6,19 +6,21 @@ default: &default
   username:
   password:
 
-development:
+development: &development
   <<: *default
   database: participacion_development
 
+# The staging, preproduction and production dbs are only needed
+# for running rake assets:precompile locally before deploying
 staging:
-  <<: *default
+  <<: *development
 
 preproduction:
-  <<: *default
+  <<: *development
 
 production:
-  <<: *default
+  <<: *development
 
 test:
   <<: *default
-  database: participacion_test
\ No newline at end of file
+  database: participacion_test
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index dda996e17..83a132ecc 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -99,13 +99,18 @@ ignore_missing:
 ignore_unused:
   - 'activerecord.*'
   - 'activemodel.*'
-  - 'admin.organizations.index.filter.*'
   - 'unauthorized.*'
   - 'simple_captcha.*'
   - 'admin.officials.level_*'
+  - 'admin.comments.index.filter*'
+  - 'admin.debates.index.filter*'
+  - 'admin.organizations.index.filter*'
+  - 'admin.users.index.filter*'
+  - 'moderation.comments.index.filter*'
+  - 'moderation.debates.index.filter*'
+  - 'debates.index.orders.*'
   - 'helpers.page_entries_info.*' # kaminari
   - 'views.pagination.*' # kaminari
-  - 'debates.index.orders.*' #order filters for debates
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'
 # - 'simple_form.{placeholders,hints,labels}.*'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8ffe45b99..d503443aa 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -164,8 +164,8 @@ en:
       phone_number_label: "Phone number"
       organization_name_label: "Organization name"
       notifications: Notifications
-      level_two_user: You are a level 2 user
-      level_three_user: You are a level 3 user
+      finish_verification: "Finish verification"
+      verified_account: Verified account
       verify_my_account: Verify my account
   simple_captcha:
     placeholder: "Enter the image value"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index b3fb6f1e6..c11ae5ebc 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -164,8 +164,8 @@ es:
       phone_number_label: "Teléfono"
       organization_name_label: "Nombre de la organización"
       notifications: Notificaciones
-      level_two_user: Eres un usuario verificado de nivel 2
-      level_three_user: Eres un usuario verificado de nivel 3
+      finish_verification: "Finalizar verificación"
+      verified_account: Cuenta verificada
       verify_my_account: Verificar mi cuenta
   simple_captcha:
     placeholder: "Introduce el texto de la imagen"
diff --git a/config/locales/verification.en.yml b/config/locales/verification.en.yml
index 5c83612e2..6ee9fd26e 100644
--- a/config/locales/verification.en.yml
+++ b/config/locales/verification.en.yml
@@ -1,49 +1,59 @@
 en:
   verification:
+    step_1: "1. Residence"
+    step_2: "2. Confirmation code"
+    step_3: "3. Final verification"
     residence:
       new:
-        title: 'Verify residence'
+        title: "Verify residence"
+        document_type_label: "Document type"
         document_type:
-          spanish_id: 'Spanish ID'
-          passport: 'Passport'
-          residence_card: 'Residence card'
-        accept_terms_text: "I accept the terms to access the city Census"
-        accept_terms_link: "Read terms"
-        form_errors: 'prevented your residence verification'
-        error_verifying_census: 'The census of the city of Madrid could not verify your information. Pero revise de information and try again or get in touch with us.'
+          spanish_id: "Spanish ID"
+          passport: "Passport"
+          residence_card: "Residence card"
+        document_number: "Document number"
+        date_of_birth: "Date of birth"
+        postal_code: "Postal code"
+        accept_terms_text: "I accept %{terms_url} to access the city Census"
+        terms: "the terms"
+        verify_residence: "Verify residence"
+        form_errors: "prevented your residence verification"
+        error_verifying_census: "The census of the city of Madrid could not verify your information. Pero revise de information and try again or get in touch with us."
       create:
         flash:
-          success: 'Residence verified'
+          success: "Residence verified"
       alert:
-        verify_attemps_left: 'You have reached the maximum number of Census verification tries'
-        unconfirmed_residency: 'You have not yet confirmed your residence'
+        verify_attemps_left: "You have reached the maximum number of Census verification tries"
+        unconfirmed_residency: "You have not yet confirmed your residence"
     sms:
       new:
-        title: Phone verification
-        submit_button: Send
+        title: "Phone verification"
+        phone: "Enter your phone for recive the code"
+        submit_button: "Send"
       create:
         flash:
-          success: 'Enter the confirmation code we have sent your phone'
+          success: "Enter the confirmation code we have sent your phone"
       edit:
-        title: Security code confirmation
-        resend_sms_text: You have not received the confirmation code in your phone?
-        resend_sms_link: Click here to send the confirmation code again
-        submit_button: Send
+        title: "Security code confirmation"
+        confirmation_code: "Code confirmation"
+        resend_sms_text: "You have not received the confirmation code in your phone?"
+        resend_sms_link: "Click here to send the confirmation code again"
+        submit_button: "Send"
       update:
-        error: 'Incorrect confirmation code'
+        error: "Incorrect confirmation code"
         flash:
           level_three:
-            success: 'Correct code. You are now a verified user'
+            success: "Correct code. Your account is verified"
           level_two:
-            success: 'Correct code'
+            success: "Correct code"
       alert:
-        verify_attemps_left: 'You have reached the maximum number of sms verification tries'
+        verify_attemps_left: "You have reached the maximum number of sms verification tries"
     email:
       show:
         flash:
-          success: 'You are now a verified user'
+          success: "You are now a verified user"
         alert:
-          failure: 'Incorrect verification code'
+          failure: "Incorrect verification code"
       create:
         flash:
           success: "We have send you a confirmation email to your email account: %{email}"
@@ -51,21 +61,27 @@ en:
           failure: "There was a problem sending you an email to your account"
     letter:
       new:
-        title: Final Verification
-        explanation: 'To completely verify your account we need to go to one of these offices or send you a letter with a special code to your home address'
-        submit_button: 'Send me a letter'
+        title: "Final Verification"
+        explanation_html:
+          "<p>Congratulations! You can now participate in discussions or support proposals of others.</p><p>To finish we need to verify your account completely provide you with a <b>maximum security code</b>, we ensure that no one is using your data on your behalf.</p><p>This requirement is essential to participate in final votes on motions. This can approach any <b>Office of Citizen</b> where you will verify in person, or in case you is impossible, we can send you a letter home with the code.</p>"
+        offices: "See Office of Citizen"
+        offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
+        send_letter: "Send me a letter with the code"
+        introduce_code: "Enter the security code"
+        send_code: "Send"
       create:
         flash:
-          success: "You will receive a letter to your home address in the next couple of days"
+          success: "Thank you for requesting a code maximum security in a few days we will send it to the address on your census data. Remember that you can save shipping collecting your code in any of the Office of Citizen Services."
         alert:
           failure: "We could not verify your address with the Census please try again later"
       alert:
-        unconfirmed_personal_data: 'You have not yet confirmed your personal data'
+        unconfirmed_code: "You have not yet enter the confirmation code"
     verified_user:
       show:
-        title: Available information
-        email_title: Emails
-        phone_title: Phones
-        use_another_phone: Use another phone
+        title: "Available information"
+        explanation: "We currently have the following data in the Census, choose where you want to send the confirmation code."
+        email_title: "Emails"
+        phone_title: "Phones"
+        use_another_phone: "Use another phone"
       form:
-        submit_button: Send
\ No newline at end of file
+        submit_button: "Send code"
\ No newline at end of file
diff --git a/config/locales/verification.es.yml b/config/locales/verification.es.yml
index afb547f16..29f61621c 100644
--- a/config/locales/verification.es.yml
+++ b/config/locales/verification.es.yml
@@ -1,49 +1,59 @@
 es:
   verification:
+    step_1: "1. Residencia"
+    step_2: "2. Código de confirmación"
+    step_3: "3. Verificación final"
     residence:
       new:
-        title: 'Verificar residencia'
+        title: "Verificar residencia"
+        document_type_label: "Tipo de documento"
         document_type:
-          spanish_id: 'DNI'
-          passport: 'Pasaporte'
-          residence_card: 'Tarjeta de residencia'
-        accept_terms_text: "Acepto los terminos de acceso al Padrón"
-        accept_terms_link: "Leer términos"
-        form_errors: 'evitaron verificar tu residencia'
-        error_verifying_census: 'El Padrón de Madrid no pudo verificar tu información. Revisa la información ó ponte en contacto con nosotros.'
+          spanish_id: "DNI"
+          passport: "Pasaporte"
+          residence_card: "Tarjeta de residencia"
+        document_number: "Número de documento"
+        date_of_birth: "Fecha de nacimiento"
+        postal_code: "Código postal"
+        accept_terms_text: "Acepto %{terms_url} al Padrón"
+        terms: "los terminos de acceso"
+        verify_residence: "Verificar residencia"
+        form_errors: "evitaron verificar tu residencia"
+        error_verifying_census: "El Padrón de Madrid no pudo verificar tu información. Revisa la información ó ponte en contacto con nosotros."
       create:
         flash:
-          success: 'Residencia verificada'
+          success: "Residencia verificada"
       alert:
-        verify_attemps_left: 'Has llegado al máximo número de intentos de verificar tu residencia.'
-        unconfirmed_residency: 'Aún no has verificado tu residencia'
+        verify_attemps_left: "Has llegado al máximo número de intentos de verificar tu residencia."
+        unconfirmed_residency: "Aún no has verificado tu residencia"
     sms:
       new:
-        title: Verificación de teléfono móvil
-        submit_button: Enviar
+        title: "Recibir código de confirmación"
+        phone: "Introduce tu teléfono móvil para recibir el código"
+        submit_button: "Enviar"
       create:
         flash:
-          success: 'Introduce el código de confirmación que te hemos enviado por mensaje de texto'
+          success: "Introduce el código de confirmación que te hemos enviado por mensaje de texto"
       edit:
-        title: 'Confirmación de código de seguridad'
-        resend_sms_text: '¿No has recibido un mensaje de texto con tu código de confirmación?'
-        resend_sms_link: 'Haz click aquí para volver a enviártelo'
-        submit_button: Enviar
+        title: "Confirmación de código de seguridad"
+        confirmation_code: "Introduce el código que has recibido en tu móvil"
+        resend_sms_text: "¿No has recibido un mensaje de texto con tu código de confirmación?"
+        resend_sms_link: "Haz click aquí para volver a enviártelo"
+        submit_button: "Enviar"
       update:
-        error: 'Código de confirmación incorrecto'
+        error: "Código de confirmación incorrecto"
         flash:
           level_three:
-            success: 'Código correcto. Ya eres un usuario verificado'
+            success: "Código correcto. Tu cuenta ya está verificada"
           level_two:
-            success: 'Código correcto'
+            success: "Código correcto"
       alert:
-        verify_attemps_left: 'Has llegado al máximo número de intentos de verificar tu teléfono.'
+        verify_attemps_left: "Has llegado al máximo número de intentos de verificar tu teléfono."
     email:
       show:
         flash:
-          success: 'Eres un usuario verificado'
+          success: "Eres un usuario verificado"
         alert:
-          failure: 'Código de verificación incorrecto'
+          failure: "Código de verificación incorrecto"
       create:
         flash:
           success: "Te hemos enviado un email de confirmación a tu cuenta: %{email}"
@@ -51,21 +61,27 @@ es:
           failure: "Hubo un problema enviándote un email a tu cuenta"
     letter:
       new:
-        title: Final Verification
-        explanation: 'To completely verify your account we need to go to one of these offices or send you a letter with a special code to your home address'
-        submit_button: 'Send me a letter'
+        title: "Verificación Final"
+        explanation_html:
+          "<p>¡Felicidades! Ya puedes participar en debates o apoyar propuestas de otras personas.</p><p>Para terminar de verificar tu cuenta completamente necesitamos proporcionarte un <b>código de máxima seguridad</b>, que nos asegure que nadie está utilizando tus datos en tu nombre.</p><p>Este requerimiento es esencial para participar en las votaciones finales de las propuestas. Para ello puedes acercarte a cualquier <b>Oficina de Atención al Ciudadano</b> donde te verificarán presencialmente, o en caso de que te sea imposible, podemos mandarte una carta a casa con el código.</p>"
+        offices: "Ver Oficinas de Atención al Ciudadano"
+        offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
+        send_letter: "Enviarme una carta con el código"
+        introduce_code: "Introduce el código de seguridad"
+        send_code: "Enviar"
       create:
         flash:
-          success: "You will receive a letter to your home address in the next couple of days"
+          success: "Gracias por solicitar tu código de máxima seguridad, en unos días te lo enviaremos a la dirección que figura en tus datos del padrón. Recuerda que puedes ahorrar el envío recogiendo tu código en cualquiera de las Oficinas de Atención al Ciudadano."
         alert:
-          failure: "We could not verify your address with the Census please try again later"
+          failure: "No podemos verificar tu dirección con el Padrón, por favor inténtalo otra vez más tarde"
       alert:
-        unconfirmed_personal_data: 'You have not yet confirmed your personal data'
+        unconfirmed_code: "Todavía no has introducido el código de confirmación"
     verified_user:
       show:
-        title: Información disponible
-        email_title: Emails
-        phone_title: Teléfonos
-        use_another_phone: Utilizar otro teléfono
+        title: "Información disponible"
+        explanation: "Actualmente disponemos de los siguientes datos en el Padrón, selecciona donde quieres que enviemos el código de confirmación."
+        email_title: "Emails"
+        phone_title: "Teléfonos"
+        use_another_phone: "Utilizar otro teléfono"
       form:
-        submit_button: Enviar
\ No newline at end of file
+        submit_button: "Enviar código"
diff --git a/db/seeds.rb b/db/seeds.rb
index 600808d1b..78d873c53 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,3 +1,7 @@
+# Default admin user (change password after first deploy to a server!)
+admin = User.create!(username: 'admin', email: 'admin@madrid.es', password: '12345678', password_confirmation: '12345678', confirmed_at: Time.now)
+admin.create_administrator
+
 # Names for the moderation console, as a hint for moderators
 # to know better how to assign users with official positions
 Setting.create(key: 'official_level_1_name', value: 'Empleados públicos')
@@ -7,4 +11,4 @@ Setting.create(key: 'official_level_4_name', value: 'Concejales')
 Setting.create(key: 'official_level_5_name', value: 'Alcaldesa')
 
 # Max percentage of allowed anonymous votes on a debate
-Setting.create(key: 'max_ratio_anon_votes_on_debates', value: '50')
\ No newline at end of file
+Setting.create(key: 'max_ratio_anon_votes_on_debates', value: '50')
diff --git a/spec/controllers/concerns/has_filters_spec.rb b/spec/controllers/concerns/has_filters_spec.rb
new file mode 100644
index 000000000..af094e9ec
--- /dev/null
+++ b/spec/controllers/concerns/has_filters_spec.rb
@@ -0,0 +1,37 @@
+require 'rails_helper'
+
+describe 'HasFilters' do
+
+  class FakeController < ActionController::Base; end
+
+  controller(FakeController) do
+    include HasFilters
+    has_filters ['all', 'pending', 'reviewed'], only: :index
+
+    def index
+      render text: "#{@current_filter} (#{@valid_filters.join(' ')})"
+    end
+  end
+
+  it "has the valid filters set up" do
+    get :index
+    expect(response.body).to eq('all (all pending reviewed)')
+  end
+
+  describe "the current filter" do
+    it "defaults to the first one on the list" do
+      get :index
+      expect(response.body).to eq('all (all pending reviewed)')
+    end
+
+    it "can be changed by the filter param" do
+      get :index, filter: 'pending'
+      expect(response.body).to eq('pending (all pending reviewed)')
+    end
+
+    it "defaults to the first one on the list if given a bogus filter" do
+      get :index, filter: 'foobar'
+      expect(response.body).to eq('all (all pending reviewed)')
+    end
+  end
+end
diff --git a/spec/controllers/debates_controller_spec.rb b/spec/controllers/debates_controller_spec.rb
index 1628c9bcf..f87635a6b 100644
--- a/spec/controllers/debates_controller_spec.rb
+++ b/spec/controllers/debates_controller_spec.rb
@@ -35,7 +35,7 @@ describe DebatesController do
 
     it 'should not allow vote if user is not allowed' do
       Setting.find_by(key: "max_ratio_anon_votes_on_debates").update(value: 0)
-      debate = create(:debate)
+      debate = create(:debate, cached_votes_total: 1000)
       sign_in create(:user)
 
       expect do
diff --git a/spec/features/verification/email_spec.rb b/spec/features/verification/email_spec.rb
index 336f4946a..12d248838 100644
--- a/spec/features/verification/email_spec.rb
+++ b/spec/features/verification/email_spec.rb
@@ -30,7 +30,7 @@ feature 'Verify email' do
     expect(page).to have_content "You are now a verified user"
 
     expect(page).to_not have_link "Verify my account"
-    expect(page).to have_content "You are a level 3 user"
+    expect(page).to have_content "Verified account"
   end
 
   scenario "Errors on token verification" do
diff --git a/spec/features/verification/letter_spec.rb b/spec/features/verification/letter_spec.rb
index fa4a451db..9a462feaf 100644
--- a/spec/features/verification/letter_spec.rb
+++ b/spec/features/verification/letter_spec.rb
@@ -10,7 +10,7 @@ feature 'Verify Letter' do
 
     click_button "Send me a letter"
 
-    expect(page).to have_content "You will receive a letter to your home address"
+    expect(page).to have_content "Thank you for requesting a code maximum security in a few days we will send it to the address on your census data. Remember that you can save shipping collecting your code in any of the Office of Citizen Services."
   end
 
   scenario "Error accessing address from CensusApi" do
@@ -34,7 +34,7 @@ feature 'Verify Letter' do
 
     click_button "Send me a letter"
 
-    expect(page).to have_content "You will receive a letter to your home address"
+    expect(page).to have_content "Thank you for requesting a code maximum security in a few days we will send it to the address on your census data. Remember that you can save shipping collecting your code in any of the Office of Citizen Services."
   end
 
   scenario "Deny access unless verified residence" do
@@ -53,7 +53,7 @@ feature 'Verify Letter' do
     login_as(user)
     visit new_letter_path
 
-    expect(page).to have_content 'You have not yet confirmed your personal data'
+    expect(page).to have_content 'You have not yet enter the confirmation code'
     expect(URI.parse(current_url).path).to eq(new_sms_path)
   end
 
diff --git a/spec/features/verification/level_three_verification_spec.rb b/spec/features/verification/level_three_verification_spec.rb
index 4f7cc9bf3..112fd859b 100644
--- a/spec/features/verification/level_three_verification_spec.rb
+++ b/spec/features/verification/level_three_verification_spec.rb
@@ -28,10 +28,10 @@ feature 'Level three verification' do
 
     expect(page).to have_content 'Correct code'
 
-    expect(page).to have_content "You are now a verified user"
+    expect(page).to have_content "Correct code. Your account is verified"
 
     expect(page).to_not have_link "Verify my account"
-    expect(page).to have_content "You are a level 3 user"
+    expect(page).to have_content "Verified account"
   end
 
   scenario 'Verification with residency and verified email' do
@@ -61,7 +61,7 @@ feature 'Level three verification' do
     expect(page).to have_content "You are now a verified user"
 
     expect(page).to_not have_link "Verify my account"
-    expect(page).to have_content "You are a level 3 user"
+    expect(page).to have_content "Verified account"
   end
 
   scenario 'Verification with residency and sms and letter' do
@@ -87,6 +87,6 @@ feature 'Level three verification' do
 
     click_button "Send me a letter"
 
-    expect(page).to have_content "You will receive a letter to your home address"
+    expect(page).to have_content "Thank you for requesting a code maximum security in a few days we will send it to the address on your census data. Remember that you can save shipping collecting your code in any of the Office of Citizen Services."
   end
 end
\ No newline at end of file
diff --git a/spec/models/debate_spec.rb b/spec/models/debate_spec.rb
index 96e3b3c96..0378dabab 100644
--- a/spec/models/debate_spec.rb
+++ b/spec/models/debate_spec.rb
@@ -124,7 +124,7 @@ describe Debate do
     end
 
     describe "from anonymous users when there are too many anonymous votes" do
-      before(:each) {debate.update(cached_anonymous_votes_total: 52, cached_votes_total: 100)}
+      before(:each) {debate.update(cached_anonymous_votes_total: 520, cached_votes_total: 1000)}
 
       it "should not register vote " do
         user = create(:user)
@@ -156,13 +156,19 @@ describe Debate do
     end
 
     it "should be true for anonymous users if allowed anonymous votes" do
-      debate.update(cached_anonymous_votes_total: 42, cached_votes_total: 100)
+      debate.update(cached_anonymous_votes_total: 420, cached_votes_total: 1000)
+      user = create(:user)
+      expect(debate.votable_by?(user)).to be true
+    end
+
+    it "should be true for anonymous users if less than 100 votes" do
+      debate.update(cached_anonymous_votes_total: 90, cached_votes_total: 92)
       user = create(:user)
       expect(debate.votable_by?(user)).to be true
     end
 
     it "should be false for anonymous users if too many anonymous votes" do
-      debate.update(cached_anonymous_votes_total: 52, cached_votes_total: 100)
+      debate.update(cached_anonymous_votes_total: 520, cached_votes_total: 1000)
       user = create(:user)
       expect(debate.votable_by?(user)).to be false
     end