diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f8d4bb811..373bb213c 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-07-07 21:23:30 +0200 using RuboCop version 0.49.1.
+# on 2017-10-17 22:05:23 +0200 using RuboCop version 0.49.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 45
+# Offense count: 40
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedHashRocketStyle, SupportedHashRocketStyles, EnforcedColonStyle, SupportedColonStyles, EnforcedLastArgumentHashStyle, SupportedLastArgumentHashStyles.
 # SupportedHashRocketStyles: key, separator, table
@@ -14,11 +14,10 @@
 # SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
 Layout/AlignHash:
   Exclude:
-    - 'app/controllers/officing/results_controller.rb'
     - 'spec/controllers/legislation/annotations_controller_spec.rb'
     - 'spec/features/admin/banners_spec.rb'
 
-# Offense count: 50
+# Offense count: 52
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
 # SupportedStyles: with_first_parameter, with_fixed_indentation
@@ -33,7 +32,7 @@ Layout/ClosingParenthesisIndentation:
     - 'spec/models/legislation/annotation_spec.rb'
     - 'spec/rails_helper.rb'
 
-# Offense count: 51
+# Offense count: 37
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: leading, trailing
@@ -68,11 +67,10 @@ Layout/EmptyLines:
   Exclude:
     - 'app/controllers/admin/budget_investment_milestones_controller.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 Layout/EmptyLinesAroundMethodBody:
   Exclude:
-    - 'app/models/abilities/administrator.rb'
     - 'lib/graph_ql/api_types_creator.rb'
 
 # Offense count: 2
@@ -126,13 +124,13 @@ Layout/IndentationConsistency:
     - 'spec/models/legislation/draft_version_spec.rb'
     - 'spec/models/proposal_spec.rb'
 
-# Offense count: 23
+# Offense count: 48
 # Cop supports --auto-correct.
 # Configuration parameters: Width, IgnoredPatterns.
 Layout/IndentationWidth:
   Enabled: false
 
-# Offense count: 7
+# Offense count: 6
 # Cop supports --auto-correct.
 Layout/LeadingCommentSpace:
   Exclude:
@@ -140,7 +138,6 @@ Layout/LeadingCommentSpace:
     - 'app/controllers/budgets/ballot/lines_controller.rb'
     - 'spec/features/budgets/ballots_spec.rb'
     - 'spec/features/comments/poll_questions_spec.rb'
-    - 'spec/features/officing/voters_spec.rb'
     - 'spec/support/common_actions.rb'
 
 # Offense count: 3
@@ -181,7 +178,7 @@ Layout/MultilineMethodCallBraceLayout:
     - 'spec/models/legislation/annotation_spec.rb'
     - 'spec/rails_helper.rb'
 
-# Offense count: 71
+# Offense count: 59
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
 # SupportedStyles: aligned, indented, indented_relative_to_receiver
@@ -201,7 +198,7 @@ Layout/MultilineMethodCallIndentation:
     - 'spec/models/proposal_spec.rb'
     - 'spec/models/user_spec.rb'
 
-# Offense count: 8
+# Offense count: 7
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
 # SupportedStyles: aligned, indented
@@ -264,29 +261,11 @@ Lint/LiteralInCondition:
   Exclude:
     - 'app/models/budget/investment.rb'
 
-# Offense count: 51
-Lint/ParenthesesAsGroupedExpression:
-  Exclude:
-    - 'spec/factories.rb'
-    - 'spec/features/admin/organizations_spec.rb'
-    - 'spec/features/budgets/investments_spec.rb'
-    - 'spec/features/campaigns_spec.rb'
-    - 'spec/features/debates_spec.rb'
-    - 'spec/features/management/managed_users_spec.rb'
-    - 'spec/features/management/proposals_spec.rb'
-    - 'spec/features/management/spending_proposals_spec.rb'
-    - 'spec/features/management/users_spec.rb'
-    - 'spec/features/proposals_spec.rb'
-    - 'spec/models/debate_spec.rb'
-
-# Offense count: 13
+# Offense count: 3
 # Cop supports --auto-correct.
 Lint/StringConversionInInterpolation:
   Exclude:
-    - 'app/models/poll/null_result.rb'
     - 'app/models/poll/partial_result.rb'
-    - 'app/models/poll/white_result.rb'
-    - 'app/models/poll/total_result.rb'
 
 # Offense count: 15
 # Cop supports --auto-correct.
@@ -311,7 +290,7 @@ Lint/UnusedMethodArgument:
     - 'app/mailers/mailer.rb'
     - 'app/models/abilities/everyone.rb'
 
-# Offense count: 278
+# Offense count: 325
 Lint/UselessAssignment:
   Enabled: false
 
@@ -320,35 +299,46 @@ Lint/Void:
   Exclude:
     - 'app/controllers/polls_controller.rb'
 
-# Offense count: 74
+# Offense count: 86
 Metrics/AbcSize:
-  Max: 54
+  Max: 64
 
-# Offense count: 454
+# Offense count: 487
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 1071
-
-# Offense count: 8
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 256
+  Max: 1227
 
 # Offense count: 10
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 262
+
+# Offense count: 13
 Metrics/CyclomaticComplexity:
   Max: 10
 
-# Offense count: 53
+# Offense count: 25
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 248
+
+# Offense count: 67
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 49
+  Max: 56
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 214
+  Max: 242
 
-# Offense count: 7
+# Offense count: 3
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 7
+
+# Offense count: 8
 Metrics/PerceivedComplexity:
   Max: 11
 
@@ -402,20 +392,20 @@ Rails/HttpPositionalArguments:
     - 'spec/controllers/pages_controller_spec.rb'
     - 'spec/controllers/users/registrations_controller_spec.rb'
 
-# Offense count: 20
+# Offense count: 18
 Rails/OutputSafety:
   Exclude:
     - 'app/controllers/admin/legislation/draft_versions_controller.rb'
     - 'app/controllers/admin/legislation/processes_controller.rb'
     - 'app/controllers/admin/legislation/questions_controller.rb'
     - 'app/controllers/budgets/investments_controller.rb'
+    - 'app/controllers/direct_uploads_controller.rb'
     - 'app/controllers/spending_proposals_controller.rb'
     - 'app/helpers/application_helper.rb'
     - 'app/helpers/text_with_links_helper.rb'
-    - 'app/helpers/users_helper.rb'
     - 'app/helpers/valuation_helper.rb'
 
-# Offense count: 70
+# Offense count: 71
 # Configuration parameters: Blacklist.
 # Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
 Rails/SkipsModelValidations:
@@ -431,7 +421,7 @@ Style/AccessorMethodName:
     - 'app/controllers/proposals_controller.rb'
     - 'lib/merged_comment_tree.rb'
 
-# Offense count: 1
+# Offense count: 8
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: braces, no_braces, context_dependent
@@ -441,7 +431,7 @@ Style/BracesAroundHashParameters:
     - 'spec/features/budgets/investments_spec.rb'
     - 'spec/features/proposals_spec.rb'
 
-# Offense count: 119
+# Offense count: 123
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
@@ -454,14 +444,13 @@ Style/ClassVars:
     - 'app/models/organization.rb'
     - 'app/models/user.rb'
 
-# Offense count: 12
+# Offense count: 8
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly, IncludeTernaryExpressions.
 # SupportedStyles: assign_to_condition, assign_inside_condition
 Style/ConditionalAssignment:
   Exclude:
     - 'app/controllers/admin/poll/booth_assignments_controller.rb'
-    - 'app/controllers/admin/poll/officer_assignments_controller.rb'
     - 'app/controllers/admin/poll/questions_controller.rb'
     - 'app/controllers/comments_controller.rb'
     - 'app/controllers/management/spending_proposals_controller.rb'
@@ -487,7 +476,7 @@ Style/FileName:
 Style/GuardClause:
   Enabled: false
 
-# Offense count: 12
+# Offense count: 11
 # Cop supports --auto-correct.
 # Configuration parameters: MaxLineLength.
 Style/IfUnlessModifier:
@@ -498,19 +487,19 @@ Style/IfUnlessModifier:
     - 'app/controllers/legislation/annotations_controller.rb'
     - 'app/controllers/valuation/budget_investments_controller.rb'
     - 'app/controllers/verification/letter_controller.rb'
-    - 'app/controllers/welcome_controller.rb'
     - 'app/helpers/embed_videos_helper.rb'
     - 'app/mailers/mailer.rb'
     - 'app/models/proposal.rb'
     - 'app/models/spending_proposal.rb'
 
-# Offense count: 4
+# Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: line_count_dependent, lambda, literal
 Style/Lambda:
   Exclude:
     - 'app/models/comment.rb'
+    - 'app/models/concerns/followable.rb'
     - 'app/models/direct_message.rb'
     - 'app/models/vote.rb'
     - 'lib/graph_ql/api_types_creator.rb'
@@ -526,17 +515,14 @@ Style/MultilineIfThen:
   Exclude:
     - 'app/controllers/management/users_controller.rb'
 
-# Offense count: 15
+# Offense count: 13
 # Cop supports --auto-correct.
 Style/MutableConstant:
   Exclude:
     - 'app/models/activity.rb'
     - 'app/models/budget/reclassified_vote.rb'
     - 'app/models/legislation/draft_version.rb'
-    - 'app/models/poll/null_result.rb'
     - 'app/models/poll/partial_result.rb'
-    - 'app/models/poll/white_result.rb'
-    - 'app/models/poll/total_result.rb'
     - 'app/models/proposal.rb'
     - 'app/models/signature_sheet.rb'
     - 'app/models/site_customization/content_block.rb'
@@ -552,7 +538,7 @@ Style/MutableConstant:
 Style/NumericLiterals:
   MinDigits: 9
 
-# Offense count: 19
+# Offense count: 20
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
 # SupportedStyles: predicate, comparison
@@ -580,7 +566,7 @@ Style/ParallelAssignment:
     - 'lib/active_model/dates.rb'
     - 'spec/support/common_actions.rb'
 
-# Offense count: 11
+# Offense count: 10
 # Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
 # NamePrefix: is_, has_, have_
 # NamePrefixBlacklist: is_, has_, have_
@@ -594,7 +580,6 @@ Style/PredicateName:
     - 'app/helpers/debates_helper.rb'
     - 'app/models/budget/ballot.rb'
     - 'app/models/user.rb'
-    - 'lib/census_api.rb'
 
 # Offense count: 4
 # Cop supports --auto-correct.
@@ -614,13 +599,14 @@ Style/RedundantBegin:
     - 'app/controllers/graphql_controller.rb'
     - 'app/models/legislation/annotation.rb'
 
-# Offense count: 3
+# Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
 # SupportedStyles: slashes, percent_r, mixed
 Style/RegexpLiteral:
   Exclude:
     - 'app/helpers/embed_videos_helper.rb'
+    - 'app/models/poll/question/answer/video.rb'
     - 'spec/customization_engine_spec.rb'
 
 # Offense count: 6
@@ -639,22 +625,16 @@ Style/SafeNavigation:
   Exclude:
     - 'app/models/signature.rb'
 
-# Offense count: 9
-# Configuration parameters: SupportedStyles.
-# SupportedStyles: snake_case, camelCase
-Style/VariableName:
-  EnforcedStyle: snake_case
-
-# Offense count: 107
+# Offense count: 93
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: snake_case, normalcase, non_integer
 Style/VariableNumber:
   Enabled: false
 
-# Offense count: 31
+# Offense count: 34
 # Cop supports --auto-correct.
 # Configuration parameters: SupportedStyles, WordRegex.
 # SupportedStyles: percent, brackets
 Style/WordArray:
   EnforcedStyle: percent
-  MinSize: 9
+  MinSize: 8
diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot
index 5564a5c62..53439b281 100644
Binary files a/app/assets/fonts/icons.eot and b/app/assets/fonts/icons.eot differ
diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg
index 0d94e5751..a0c854397 100644
--- a/app/assets/fonts/icons.svg
+++ b/app/assets/fonts/icons.svg
@@ -65,4 +65,9 @@
 <glyph glyph-name="image" unicode="&#51;" d="M165 347c0-15-6-28-16-38-11-11-24-16-39-16-16 0-28 5-39 16-11 10-16 23-16 38 0 16 5 29 16 39 11 11 23 16 39 16 15 0 28-5 39-16 10-10 16-23 16-39z m292-109l0-128-402 0 0 55 91 91 46-46 146 147z m28 201l-458 0c-2 0-4-1-6-3-2-2-3-4-3-6l0-348c0-2 1-4 3-6 2-2 4-3 6-3l458 0c2 0 4 1 6 3 2 2 3 4 3 6l0 348c0 2-1 4-3 6-2 2-4 3-6 3z m45-9l0-348c0-12-4-23-13-32-9-9-20-13-32-13l-458 0c-12 0-23 4-32 13-9 9-13 20-13 32l0 348c0 12 4 23 13 32 9 9 20 13 32 13l458 0c12 0 23-4 32-13 9-9 13-20 13-32z"/>
 <glyph glyph-name="search-plus" unicode="&#52;" d="M311 283l0-18c0-2-1-4-3-6-2-2-4-3-6-3l-64 0 0-64c0-2-1-5-3-6-2-2-4-3-6-3l-19 0c-2 0-4 1-6 3-2 1-3 4-3 6l0 64-64 0c-2 0-4 1-6 3-2 2-3 4-3 6l0 18c0 3 1 5 3 7 2 2 4 3 6 3l64 0 0 64c0 2 1 4 3 6 2 2 4 3 6 3l19 0c2 0 4-1 6-3 2-2 3-4 3-6l0-64 64 0c2 0 4-1 6-3 2-2 3-4 3-7z m36-9c0 36-12 66-37 91-25 25-55 37-91 37-35 0-65-12-90-37-25-25-38-55-38-91 0-35 13-65 38-90 25-25 55-38 90-38 36 0 66 13 91 38 25 25 37 55 37 90z m147-237c0-11-4-19-11-26-7-7-16-11-26-11-10 0-19 4-26 11l-98 98c-34-24-72-36-114-36-27 0-53 5-78 16-25 11-46 25-64 43-18 18-32 39-43 64-10 25-16 51-16 78 0 28 6 54 16 78 11 25 25 47 43 65 18 18 39 32 64 43 25 10 51 15 78 15 28 0 54-5 79-15 24-11 46-25 64-43 18-18 32-40 43-65 10-24 16-50 16-78 0-42-12-80-36-114l98-98c7-7 11-15 11-25z"/>
 <glyph glyph-name="search-minus" unicode="&#53;" d="M311 283l0-18c0-2-1-4-3-6-2-2-4-3-6-3l-165 0c-2 0-4 1-6 3-2 2-3 4-3 6l0 18c0 3 1 5 3 7 2 2 4 3 6 3l165 0c2 0 4-1 6-3 2-2 3-4 3-7z m36-9c0 36-12 66-37 91-25 25-55 37-91 37-35 0-65-12-90-37-25-25-38-55-38-91 0-35 13-65 38-90 25-25 55-38 90-38 36 0 66 13 91 38 25 25 37 55 37 90z m147-237c0-11-4-19-11-26-7-7-16-11-26-11-10 0-19 4-26 11l-98 98c-34-24-72-36-114-36-27 0-53 5-78 16-25 11-46 25-64 43-18 18-32 39-43 64-10 25-16 51-16 78 0 28 6 54 16 78 11 25 25 47 43 65 18 18 39 32 64 43 25 10 51 15 78 15 28 0 54-5 79-15 24-11 46-25 64-43 18-18 32-40 43-65 10-24 16-50 16-78 0-42-12-80-36-114l98-98c7-7 11-15 11-25z"/>
+<glyph glyph-name="calculator" unicode="&#54;" d="M110 73c0 10-4 19-11 26-7 7-16 11-26 11-10 0-19-4-26-11-7-7-10-16-10-26 0-10 3-19 10-26 7-7 16-10 26-10 10 0 19 3 26 10 7 7 11 16 11 26z m109 0c0 10-3 19-10 26-7 7-16 11-26 11-10 0-19-4-26-11-7-7-11-16-11-26 0-10 4-19 11-26 7-7 16-10 26-10 10 0 19 3 26 10 7 7 10 16 10 26z m-109 110c0 10-4 19-11 26-7 7-16 10-26 10-10 0-19-3-26-10-7-7-10-16-10-26 0-10 3-19 10-26 7-7 16-11 26-11 10 0 19 4 26 11 7 7 11 16 11 26z m219-110c0 10-3 19-11 26-7 7-15 11-25 11-11 0-19-4-26-11-7-7-11-16-11-26 0-10 4-19 11-26 7-7 15-10 26-10 10 0 18 3 25 10 8 7 11 16 11 26z m-110 110c0 10-3 19-10 26-7 7-16 10-26 10-10 0-19-3-26-10-7-7-11-16-11-26 0-10 4-19 11-26 7-7 16-11 26-11 10 0 19 4 26 11 7 7 10 16 10 26z m-109 110c0 10-4 18-11 25-7 8-16 11-26 11-10 0-19-3-26-11-7-7-10-15-10-25 0-11 3-19 10-26 7-7 16-11 26-11 10 0 19 4 26 11 7 7 11 15 11 26z m219-110c0 10-3 19-11 26-7 7-15 10-25 10-11 0-19-3-26-10-7-7-11-16-11-26 0-10 4-19 11-26 7-7 15-11 26-11 10 0 18 4 25 11 8 7 11 16 11 26z m-110 110c0 10-3 18-10 25-7 8-16 11-26 11-10 0-19-3-26-11-7-7-11-15-11-25 0-11 4-19 11-26 7-7 16-11 26-11 10 0 19 4 26 11 7 7 10 15 10 26z m220-220l0 110c0 10-4 18-11 26-7 7-16 10-26 10-10 0-18-3-25-10-8-8-11-16-11-26l0-110c0-10 3-18 11-26 7-7 15-10 25-10 10 0 19 3 26 10 7 8 11 16 11 26z m-110 220c0 10-3 18-11 25-7 8-15 11-25 11-11 0-19-3-26-11-7-7-11-15-11-25 0-11 4-19 11-26 7-7 15-11 26-11 10 0 18 4 25 11 8 7 11 15 11 26z m110 91l0 73c0 5-2 9-6 13-3 4-7 5-12 5l-366 0c-5 0-9-1-13-5-4-4-5-8-5-13l0-73c0-5 1-9 5-13 4-3 8-5 13-5l366 0c5 0 9 2 12 5 4 4 6 8 6 13z m0-91c0 10-4 18-11 25-7 8-16 11-26 11-10 0-18-3-26-11-7-7-10-15-10-25 0-11 3-19 10-26 8-7 16-11 26-11 10 0 19 4 26 11 7 7 11 15 11 26z m36 182l0-438c0-10-3-19-10-26-8-7-16-11-26-11l-402 0c-10 0-19 4-26 11-7 7-11 16-11 26l0 438c0 10 4 19 11 26 7 7 16 11 26 11l402 0c10 0 18-4 26-11 7-7 10-16 10-26z"/>
+<glyph glyph-name="map-marker" unicode="&#55;" d="M329 329c0 20-7 38-21 52-15 14-32 21-52 21-20 0-37-7-52-21-14-14-21-32-21-52 0-20 7-37 21-52 15-14 32-21 52-21 20 0 37 7 52 21 14 15 21 32 21 52z m73 0c0-21-3-38-9-51l-104-221c-3-6-8-11-14-15-6-4-12-5-19-5-7 0-13 1-19 5-6 4-11 9-14 15l-104 221c-6 13-9 30-9 51 0 41 14 75 43 104 28 28 63 42 103 42 40 0 75-14 103-42 29-29 43-63 43-104z"/>
+<glyph glyph-name="user-plus" unicode="&#56;" d="M165 256c-31 0-57 11-78 32-21 22-32 47-32 78 0 30 11 56 32 77 21 22 47 32 78 32 30 0 56-10 77-32 22-21 32-47 32-77 0-31-10-56-32-78-21-21-47-32-77-32z m274-37l100 0c3 0 5 0 7-2 2-2 3-4 3-7l0-55c0-2-1-4-3-6-2-2-4-3-7-3l-100 0 0-100c0-3-1-5-3-7-2-2-4-2-6-2l-55 0c-3 0-5 0-7 2-1 2-2 4-2 7l0 100-101 0c-2 0-4 1-6 3-2 2-3 4-3 6l0 55c0 3 1 5 3 7 2 2 4 2 6 2l101 0 0 101c0 2 1 5 2 6 2 2 4 3 7 3l55 0c2 0 4-1 6-3 2-1 3-4 3-6z m-210-64c0-9 3-18 10-25 8-8 16-11 26-11l73 0 0-68c-13-10-29-14-49-14l-249 0c-23 0-42 6-56 19-14 13-21 32-21 55 0 10 1 20 1 29 1 10 2 20 4 31 2 11 5 22 8 31 3 10 7 19 12 28 5 9 11 17 18 23 7 7 15 12 24 16 10 3 21 5 32 5 4 0 8-1 11-5 15-11 30-20 45-26 14-6 30-8 47-8 17 0 32 2 47 8 14 6 29 15 44 26 4 4 7 5 11 5 25 0 46-9 62-27l-64 0c-10 0-18-4-26-11-7-7-10-16-10-26z"/>
+<glyph glyph-name="file-text-o" unicode="&#57;" d="M456 403c5-5 10-12 14-21 4-9 5-18 5-25l0-330c0-7-2-14-8-19-5-5-11-8-19-8l-384 0c-8 0-14 3-19 8-6 5-8 12-8 19l0 458c0 7 2 14 8 19 5 5 11 8 19 8l256 0c8 0 16-2 25-6 9-4 17-8 22-13z m-127 70l0-107 108 0c-2 5-4 9-7 11l-89 90c-2 2-6 4-12 6z m110-436l0 292-119 0c-8 0-14 3-19 8-6 5-8 12-8 20l0 118-220 0 0-438z m-293 246c0 3 1 5 3 7 2 2 4 3 6 3l202 0c2 0 4-1 6-3 2-2 3-4 3-7l0-18c0-3-1-5-3-6-2-2-4-3-6-3l-202 0c-2 0-4 1-6 3-2 1-3 3-3 6z m211-64c2 0 4 0 6-2 2-2 3-4 3-7l0-18c0-3-1-5-3-7-2-1-4-2-6-2l-202 0c-2 0-4 1-6 2-2 2-3 4-3 7l0 18c0 3 1 5 3 7 2 2 4 2 6 2z m0-73c2 0 4-1 6-2 2-2 3-4 3-7l0-18c0-3-1-5-3-7-2-1-4-2-6-2l-202 0c-2 0-4 1-6 2-2 2-3 4-3 7l0 18c0 3 1 5 3 7 2 1 4 2 6 2z"/>
+<glyph glyph-name="file-text" unicode="&#33;" d="M456 376c3-3 5-6 8-10l-135 0 0 135c4-3 8-6 10-8z m-136-47l155 0 0-302c0-7-2-14-8-19-5-5-11-8-19-8l-384 0c-8 0-14 3-19 8-6 5-8 12-8 19l0 458c0 7 2 14 8 19 5 5 11 8 19 8l229 0 0-155c0-8 2-15 8-20 5-5 11-8 19-8z m46-210l0 18c0 3-1 5-3 7-2 1-4 2-6 2l-202 0c-2 0-4-1-6-2-2-2-3-4-3-7l0-18c0-3 1-5 3-7 2-1 4-2 6-2l202 0c2 0 4 1 6 2 2 2 3 4 3 7z m0 73l0 18c0 3-1 5-3 7-2 2-4 2-6 2l-202 0c-2 0-4 0-6-2-2-2-3-4-3-7l0-18c0-3 1-5 3-7 2-1 4-2 6-2l202 0c2 0 4 1 6 2 2 2 3 4 3 7z m0 73l0 18c0 3-1 5-3 7-2 2-4 3-6 3l-202 0c-2 0-4-1-6-3-2-2-3-4-3-7l0-18c0-3 1-5 3-6 2-2 4-3 6-3l202 0c2 0 4 1 6 3 2 1 3 3 3 6z"/>
 </font></defs></svg>
diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf
index 6af0797fb..3bd8e9dec 100644
Binary files a/app/assets/fonts/icons.ttf and b/app/assets/fonts/icons.ttf differ
diff --git a/app/assets/fonts/icons.woff b/app/assets/fonts/icons.woff
index 7f8f3c95e..0ac7f8f19 100644
Binary files a/app/assets/fonts/icons.woff and b/app/assets/fonts/icons.woff differ
diff --git a/app/assets/images/help/help_icon_budgets.png b/app/assets/images/help/help_icon_budgets.png
index fc5e3022f..f986a939c 100644
Binary files a/app/assets/images/help/help_icon_budgets.png and b/app/assets/images/help/help_icon_budgets.png differ
diff --git a/app/assets/images/help/help_icon_polls.png b/app/assets/images/help/help_icon_polls.png
index b7f7cf479..f13363934 100644
Binary files a/app/assets/images/help/help_icon_polls.png and b/app/assets/images/help/help_icon_polls.png differ
diff --git a/app/assets/javascripts/polls.js.coffee b/app/assets/javascripts/polls.js.coffee
index 5cf792ce2..ac2c759ba 100644
--- a/app/assets/javascripts/polls.js.coffee
+++ b/app/assets/javascripts/polls.js.coffee
@@ -26,3 +26,19 @@ App.Polls =
           token_message.html(token_message.html() + "<br><strong>" + @token + "</strong>");
           token_message.show()
     false
+
+    $(".zoom-link").on "click", (event) ->
+      element = event.target
+      answer = $(element).closest('div.answer')
+
+      if $(answer).hasClass('medium-6')
+        $(answer).removeClass("medium-6");
+        $(answer).addClass("answer-divider");
+        unless $(answer).hasClass('first')
+          $(answer).insertBefore($(answer).prev('div.answer'));
+      else
+        $(answer).addClass("medium-6");
+        $(answer).removeClass("answer-divider");
+        unless $(answer).hasClass('first')
+          $(answer).insertAfter($(answer).next('div.answer'));
+
diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss
index 96eb10a0d..b9f2735b4 100644
--- a/app/assets/stylesheets/icons.scss
+++ b/app/assets/stylesheets/icons.scss
@@ -268,3 +268,23 @@
 .icon-search-minus::before {
   content: '\35';
 }
+
+.icon-calculator::before {
+  content: '\36';
+}
+
+.icon-map-marker::before {
+  content: '\37';
+}
+
+.icon-user-plus::before {
+  content: '\38';
+}
+
+.icon-file-text-o::before {
+  content: '\39';
+}
+
+.icon-file-text::before {
+  content: '\21';
+}
diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 160819795..06fdfd396 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -372,6 +372,10 @@ a {
   display: table-cell;
 }
 
+.off-canvas-content {
+  box-shadow: none;
+}
+
 // 02. Header
 // ----------
 
@@ -1135,8 +1139,13 @@ form {
     color: #ecf00b;
     font-size: rem-calc(10);
     position: absolute;
-    right: 8px;
+    left: 12px;
     top: 6px;
+
+    @include breakpoint(medium) {
+      left: auto;
+      right: 8px;
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/print.css b/app/assets/stylesheets/print.css
index 6b3e5d6f6..58d2bab5e 100644
--- a/app/assets/stylesheets/print.css
+++ b/app/assets/stylesheets/print.css
@@ -12,7 +12,7 @@
 
 #print_link { display: none !important; }
 
-#responsive-menu { display: none !important; }
+#responsive_menu { display: none !important; }
 
 .admin-sidebar { display: none !important; }
 
diff --git a/app/controllers/admin/poll/officer_assignments_controller.rb b/app/controllers/admin/poll/officer_assignments_controller.rb
index fd62df8b3..7532362a7 100644
--- a/app/controllers/admin/poll/officer_assignments_controller.rb
+++ b/app/controllers/admin/poll/officer_assignments_controller.rb
@@ -25,7 +25,9 @@ class Admin::Poll::OfficerAssignmentsController < Admin::Poll::BaseController
 
   def search_officers
     load_search
-    @officers = User.joins(:poll_officer).search(@search).order(username: :asc)
+
+    poll_officers = User.where(id: @poll.officers.pluck(:user_id))
+    @officers = poll_officers.search(@search).order(username: :asc)
 
     respond_to do |format|
       format.js
diff --git a/app/controllers/admin/poll/polls_controller.rb b/app/controllers/admin/poll/polls_controller.rb
index cce880ed4..5103275fb 100644
--- a/app/controllers/admin/poll/polls_controller.rb
+++ b/app/controllers/admin/poll/polls_controller.rb
@@ -54,7 +54,7 @@ class Admin::Poll::PollsController < Admin::Poll::BaseController
     end
 
     def poll_params
-      params.require(:poll).permit(:name, :starts_at, :ends_at, :geozone_restricted, :summary, :description, 
+      params.require(:poll).permit(:name, :starts_at, :ends_at, :geozone_restricted, :summary, :description,
                                    geozone_ids: [],
                                    image_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy])
     end
diff --git a/app/controllers/admin/poll/questions/answers/images_controller.rb b/app/controllers/admin/poll/questions/answers/images_controller.rb
index 1bf30907d..030e177a1 100644
--- a/app/controllers/admin/poll/questions/answers/images_controller.rb
+++ b/app/controllers/admin/poll/questions/answers/images_controller.rb
@@ -5,7 +5,7 @@ class Admin::Poll::Questions::Answers::ImagesController < Admin::Poll::BaseContr
   end
 
   def new
-  	@answer = ::Poll::Question::Answer.find(params[:answer_id])
+    @answer = ::Poll::Question::Answer.find(params[:answer_id])
   end
 
   def create
diff --git a/app/controllers/admin/poll/questions/answers/videos_controller.rb b/app/controllers/admin/poll/questions/answers/videos_controller.rb
index a231c1a20..e9262b6dd 100644
--- a/app/controllers/admin/poll/questions/answers/videos_controller.rb
+++ b/app/controllers/admin/poll/questions/answers/videos_controller.rb
@@ -33,11 +33,11 @@ class Admin::Poll::Questions::Answers::VideosController < Admin::Poll::BaseContr
   end
 
   def destroy
-    if @video.destroy
-      notice = t("flash.actions.destroy.poll_question_answer_video")
-    else
-      notice = t("flash.actions.destroy.error")
-    end
+    notice = if @video.destroy
+      t("flash.actions.destroy.poll_question_answer_video")
+             else
+      t("flash.actions.destroy.error")
+             end
     redirect_to :back, notice: notice
   end
 
diff --git a/app/controllers/admin/poll/shifts_controller.rb b/app/controllers/admin/poll/shifts_controller.rb
index 1f60b2b4e..89bb68999 100644
--- a/app/controllers/admin/poll/shifts_controller.rb
+++ b/app/controllers/admin/poll/shifts_controller.rb
@@ -49,7 +49,7 @@ class Admin::Poll::ShiftsController < Admin::Poll::BaseController
     end
 
     def shift_params
-      shift_params = params.require(:shift).permit(:booth_id, :officer_id, :task, date:[:vote_collection_date, :recount_scrutiny_date])
+      shift_params = params.require(:shift).permit(:booth_id, :officer_id, :task, date: [:vote_collection_date, :recount_scrutiny_date])
       shift_params.merge(date: shift_params[:date]["#{shift_params[:task]}_date".to_sym])
     end
 end
diff --git a/app/controllers/direct_uploads_controller.rb b/app/controllers/direct_uploads_controller.rb
index ade7d631f..a067a5d04 100644
--- a/app/controllers/direct_uploads_controller.rb
+++ b/app/controllers/direct_uploads_controller.rb
@@ -18,8 +18,7 @@ class DirectUploadsController < ApplicationController
       render json: { cached_attachment: @direct_upload.relation.cached_attachment,
                      filename: @direct_upload.relation.attachment.original_filename,
                      destroy_link: render_destroy_upload_link(@direct_upload).html_safe,
-                     attachment_url: @direct_upload.relation.attachment.url
-                   }
+                     attachment_url: @direct_upload.relation.attachment.url}
     else
       @direct_upload.destroy_attachment
       render json: { errors: @direct_upload.errors[:attachment].join(", ") },
@@ -28,7 +27,7 @@ class DirectUploadsController < ApplicationController
   end
 
   def destroy
-    @direct_upload = DirectUpload.new(direct_upload_params.merge(user: current_user) )
+    @direct_upload = DirectUpload.new(direct_upload_params.merge(user: current_user))
     @direct_upload.relation.set_attachment_from_cached_attachment
 
     if @direct_upload.destroy_attachment
diff --git a/app/helpers/documentables_helper.rb b/app/helpers/documentables_helper.rb
index 8d9f85578..3fe56abd2 100644
--- a/app/helpers/documentables_helper.rb
+++ b/app/helpers/documentables_helper.rb
@@ -24,8 +24,8 @@ module DocumentablesHelper
 
   def documentable_humanized_accepted_content_types(documentable_class)
     documentable_class.accepted_content_types
-                .collect{ |content_type| content_type.split("/").last }
-                .join(", ")
+                      .collect{ |content_type| content_type.split("/").last }
+                      .join(", ")
   end
 
   def documentables_note(documentable)
diff --git a/app/helpers/documents_helper.rb b/app/helpers/documents_helper.rb
index d7e8d1dea..70eb6a27f 100644
--- a/app/helpers/documents_helper.rb
+++ b/app/helpers/documents_helper.rb
@@ -33,7 +33,7 @@ module DocumentsHelper
 
   def render_attachment(builder, document)
     klass = document.errors[:attachment].any? ? "error" : ""
-    klass = document.persisted? || document.cached_attachment.present?  ? " hide" : ""
+    klass = document.persisted? || document.cached_attachment.present? ? " hide" : ""
     html = builder.label :attachment,
                          t("documents.form.attachment_label"),
                          class: "button hollow #{klass}"
diff --git a/app/helpers/imageables_helper.rb b/app/helpers/imageables_helper.rb
index b1c8059ce..8cae1b989 100644
--- a/app/helpers/imageables_helper.rb
+++ b/app/helpers/imageables_helper.rb
@@ -9,10 +9,10 @@ module ImageablesHelper
   end
 
   def imageable_max_file_size
-    bytesToMeg(Image::MAX_IMAGE_SIZE)
+    bytes_to_megabytes(Image::MAX_IMAGE_SIZE)
   end
 
-  def bytesToMeg(bytes)
+  def bytes_to_megabytes(bytes)
     bytes / Numeric::MEGABYTE
   end
 
@@ -22,19 +22,19 @@ module ImageablesHelper
 
   def imageable_accepted_content_types_extensions
     Image::ACCEPTED_CONTENT_TYPE
-                .collect{ |content_type| ".#{content_type.split("/").last}" }
-                .join(",")
+      .collect{ |content_type| ".#{content_type.split('/').last}" }
+      .join(",")
   end
 
   def imageable_humanized_accepted_content_types
     Image::ACCEPTED_CONTENT_TYPE
-                .collect{ |content_type| content_type.split("/").last }
-                .join(", ")
+      .collect{ |content_type| content_type.split("/").last }
+      .join(", ")
   end
 
-  def imageables_note(imageable)
+  def imageables_note(_imageable)
     t "images.form.note", accepted_content_types: imageable_humanized_accepted_content_types,
                           max_file_size: imageable_max_file_size
   end
 
-end
\ No newline at end of file
+end
diff --git a/app/helpers/images_helper.rb b/app/helpers/images_helper.rb
index 4e2bdff0e..208ccf5ab 100644
--- a/app/helpers/images_helper.rb
+++ b/app/helpers/images_helper.rb
@@ -22,7 +22,7 @@ module ImagesHelper
     image.errors[:attachment].join(', ') if image.errors.key?(:attachment)
   end
 
-  def image_bytesToMeg(bytes)
+  def image_bytes_to_megabytes(bytes)
     bytes / Numeric::MEGABYTE
   end
 
diff --git a/app/helpers/polls_helper.rb b/app/helpers/polls_helper.rb
index dd4018be7..0d5b0a605 100644
--- a/app/helpers/polls_helper.rb
+++ b/app/helpers/polls_helper.rb
@@ -44,7 +44,7 @@ module PollsHelper
   def poll_voter_token(poll, user)
     Poll::Voter.where(poll: poll, user: user, origin: "web").first&.token || ''
   end
-  
+
   def voted_before_sign_in(question)
     question.answers.where(author: current_user).any? { |vote| current_user.current_sign_in_at >= vote.updated_at }
   end
diff --git a/app/helpers/shifts_helper.rb b/app/helpers/shifts_helper.rb
index dc9f97a91..3773014ac 100644
--- a/app/helpers/shifts_helper.rb
+++ b/app/helpers/shifts_helper.rb
@@ -1,19 +1,28 @@
 module ShiftsHelper
 
   def shift_vote_collection_dates(polls)
-    date_options((start_date(polls)..end_date(polls)))
+    date_options((start_date(polls)..end_date(polls)), Poll::Shift.tasks[:vote_collection])
   end
 
   def shift_recount_scrutiny_dates(polls)
-    date_options(polls.map(&:ends_at).map(&:to_date).sort.inject([]) { |total, date| total << (date..date + 1.week).to_a }.flatten.uniq)
+    dates = polls.map(&:ends_at).map(&:to_date).sort.inject([]) do |total, date|
+      initial_date = date < Date.current ? Date.current : date
+      total << (initial_date..date + Poll::RECOUNT_DURATION).to_a
+    end
+    date_options(dates.flatten.uniq, Poll::Shift.tasks[:recount_scrutiny])
   end
 
-  def date_options(dates)
-    dates.map { |date| [l(date, format: :long), l(date)] }
+  def date_options(dates, task_id)
+    valid_dates(dates, task_id).map { |date| [l(date, format: :long), l(date)] }
+  end
+
+  def valid_dates(dates, task_id)
+    dates.reject { |date| officer_shifts(task_id).include?(date) }
   end
 
   def start_date(polls)
-    polls.map(&:starts_at).min.to_date
+    start_date = polls.map(&:starts_at).min.to_date
+    start_date < Date.current ? Date.current : start_date
   end
 
   def end_date(polls)
@@ -24,4 +33,9 @@ module ShiftsHelper
     officers.collect { |officer| [officer.name, officer.id] }
   end
 
+  private
+
+  def officer_shifts(task_id)
+    @officer.shifts.where(task: task_id).map(&:date)
+  end
 end
diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
index 9f8c8c13e..0b483468f 100644
--- a/app/helpers/welcome_helper.rb
+++ b/app/helpers/welcome_helper.rb
@@ -1,11 +1,11 @@
 module WelcomeHelper
 
   def active_class(index)
-    "is-active is-in" if index == 0
+    "is-active is-in" if index.zero?
   end
 
   def slide_display(index)
-    "display: none;" if index > 0
+    "display: none;" if index.positive?
   end
 
   def recommended_path(recommended)
@@ -46,17 +46,13 @@ module WelcomeHelper
   end
 
   def calculate_offset(debates, proposals, apply_offset)
-    if (debates.any? && proposals.any?)
-      if apply_offset
-        offset = "medium-offset-2 large-offset-2"
-      else
-        offset = "end"
-      end
+    if debates.any? && proposals.any?
+      offset = if apply_offset
+        "medium-offset-2 large-offset-2"
+               else
+        "end"
+               end
     end
   end
 
-  def highlight_background
-    (feature?("user.recommendations") && current_user) ? "highlight" : ""
-  end
-
 end
diff --git a/app/models/concerns/followable.rb b/app/models/concerns/followable.rb
index fee1ebd7f..d635cadda 100644
--- a/app/models/concerns/followable.rb
+++ b/app/models/concerns/followable.rb
@@ -5,7 +5,7 @@ module Followable
     has_many :follows, as: :followable, dependent: :destroy
     has_many :followers, through: :follows, source: :user
 
-    scope :followed_by_user, -> (user){
+    scope :followed_by_user, ->(user){
       joins(:follows).where("follows.user_id = ?", user.id)
     }
   end
diff --git a/app/models/debate.rb b/app/models/debate.rb
index eb424c308..65c06345d 100644
--- a/app/models/debate.rb
+++ b/app/models/debate.rb
@@ -48,8 +48,8 @@ class Debate < ActiveRecord::Base
   attr_accessor :link_required
 
   def self.recommendations(user)
-    tagged_with(user.interests, any: true).
-    where("author_id != ?", user.id)
+    tagged_with(user.interests, any: true)
+      .where("author_id != ?", user.id)
   end
 
   def searchable_values
diff --git a/app/models/direct_upload.rb b/app/models/direct_upload.rb
index e597f9f12..6681aa7be 100644
--- a/app/models/direct_upload.rb
+++ b/app/models/direct_upload.rb
@@ -7,7 +7,7 @@ class DirectUpload
                 :relation, :resource_relation,
                 :attachment, :cached_attachment, :user
 
-  validates_presence_of :attachment, :resource_type, :resource_relation, :user
+  validates :attachment, :resource_type, :resource_relation, :user, presence: true
   validate :parent_resource_attachment_validations,
            if: -> { attachment.present? && resource_type.present? && resource_relation.present? && user.present? }
 
@@ -19,15 +19,15 @@ class DirectUpload
     if @resource_type.present? && @resource_relation.present? && (@attachment.present? || @cached_attachment.present?)
       @resource = @resource_type.constantize.find_or_initialize_by(id: @resource_id)
 
-      #Refactor
-      if @resource.respond_to?(:images) &&
-        ((@attachment.present? && !@attachment.content_type.match(/pdf/)) || @cached_attachment.present?)
-        @relation = @resource.images.send("build", relation_attributtes)
-      elsif @resource.class.reflections[@resource_relation].macro == :has_one
-        @relation = @resource.send("build_#{resource_relation}", relation_attributtes)
-      else
-        @relation = @resource.send(@resource_relation).build(relation_attributtes)
-      end
+      # Refactor
+      @relation = if @resource.respond_to?(:images) &&
+                     ((@attachment.present? && !@attachment.content_type.match(/pdf/)) || @cached_attachment.present?)
+        @resource.images.send("build", relation_attributtes)
+                  elsif @resource.class.reflections[@resource_relation].macro == :has_one
+        @resource.send("build_#{resource_relation}", relation_attributtes)
+                  else
+        @resource.send(@resource_relation).build(relation_attributtes)
+                  end
 
       @relation.user = user
     end
@@ -50,7 +50,7 @@ class DirectUpload
   def parent_resource_attachment_validations
     @relation.valid?
 
-    if @relation.errors.has_key? :attachment
+    if @relation.errors.key? :attachment
       errors[:attachment] = @relation.errors[:attachment]
     end
   end
diff --git a/app/models/document.rb b/app/models/document.rb
index f680bc04e..8843bbed9 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -44,7 +44,7 @@ class Document < ActiveRecord::Base
     attachment.instance.prefix(attachment, style)
   end
 
-  def prefix(attachment, style)
+  def prefix(attachment, _style)
     if !attachment.instance.persisted?
       "cached_attachments/user/#{attachment.instance.user_id}"
     else
diff --git a/app/models/image.rb b/app/models/image.rb
index 84b38dd4a..99061f6f1 100644
--- a/app/models/image.rb
+++ b/app/models/image.rb
@@ -5,7 +5,7 @@ class Image < ActiveRecord::Base
   TITLE_LEGHT_RANGE = 4..80
   MIN_SIZE = 475
   MAX_IMAGE_SIZE = 1.megabyte
-  ACCEPTED_CONTENT_TYPE = %w(image/jpeg image/jpg)
+  ACCEPTED_CONTENT_TYPE = %w(image/jpeg image/jpg).freeze
 
   has_attached_file :attachment, styles: { large: "x#{MIN_SIZE}", medium: "300x300#", thumb: "140x245#" },
                                  url: "/system/:class/:prefix/:style/:hash.:extension",
@@ -52,7 +52,7 @@ class Image < ActiveRecord::Base
     attachment.instance.prefix(attachment, style)
   end
 
-  def prefix(attachment, style)
+  def prefix(attachment, _style)
     if !attachment.instance.persisted?
       "cached_attachments/user/#{attachment.instance.user_id}"
     else
@@ -103,8 +103,8 @@ class Image < ActiveRecord::Base
 
     def remove_cached_attachment
       image = Image.new(imageable: imageable,
-                           cached_attachment: cached_attachment,
-                           user: user)
+                        cached_attachment: cached_attachment,
+                        user: user)
       image.set_attachment_from_cached_attachment
       image.attachment.destroy
     end
diff --git a/app/models/poll.rb b/app/models/poll.rb
index 8675ce49a..27125d8a1 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -2,6 +2,9 @@ class Poll < ActiveRecord::Base
   include Imageable
   acts_as_paranoid column: :hidden_at
   include ActsAsParanoidAliases
+
+  RECOUNT_DURATION = 1.week
+
   has_many :booth_assignments, class_name: "Poll::BoothAssignment"
   has_many :booths, through: :booth_assignments
   has_many :partial_results, through: :booth_assignments
@@ -22,6 +25,7 @@ class Poll < ActiveRecord::Base
   scope :current,  -> { where('starts_at <= ? and ? <= ends_at', Date.current.beginning_of_day, Date.current.beginning_of_day) }
   scope :incoming, -> { where('? < starts_at', Date.current.beginning_of_day) }
   scope :expired,  -> { where('ends_at < ?', Date.current.beginning_of_day) }
+  scope :recounting, -> { Poll.where(ends_at: (Date.current.beginning_of_day - RECOUNT_DURATION)..Date.current.beginning_of_day) }
   scope :published, -> { where('published = ?', true) }
   scope :by_geozone_id, ->(geozone_id) { where(geozones: {id: geozone_id}.joins(:geozones)) }
 
@@ -47,6 +51,10 @@ class Poll < ActiveRecord::Base
     current + incoming
   end
 
+  def self.current_or_recounting_or_incoming
+    current + recounting + incoming
+  end
+
   def answerable_by?(user)
     user.present? &&
       user.level_two_or_three_verified? &&
@@ -72,6 +80,10 @@ class Poll < ActiveRecord::Base
     Poll::Voter.where(poll: self, user: user, origin: "booth").exists?
   end
 
+  def voted_in_web?(user)
+    Poll::Voter.where(poll: self, user: user, origin: "web").exists?
+  end
+
   def date_range
     unless starts_at.present? && ends_at.present? && starts_at <= ends_at
       errors.add(:starts_at, I18n.t('errors.messages.invalid_date_range'))
diff --git a/app/models/poll/null_result.rb b/app/models/poll/null_result.rb
deleted file mode 100644
index d10fe3cb0..000000000
--- a/app/models/poll/null_result.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-class Poll::NullResult < ActiveRecord::Base
-
-  VALID_ORIGINS = %w{web booth}
-
-  belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id'
-  belongs_to :booth_assignment
-  belongs_to :officer_assignment
-
-  validates :author, presence: true
-  validates :origin, inclusion: {in: VALID_ORIGINS}
-
-  scope :by_author, ->(author_id) { where(author_id: author_id) }
-
-  before_save :update_logs
-
-  def update_logs
-    if amount_changed? && amount_was.present?
-      self.amount_log += ":#{amount_was.to_s}"
-      self.officer_assignment_id_log += ":#{officer_assignment_id_was.to_s}"
-      self.author_id_log += ":#{author_id_was.to_s}"
-    end
-  end
-end
diff --git a/app/models/poll/question.rb b/app/models/poll/question.rb
index efcaf4635..90e528bd0 100644
--- a/app/models/poll/question.rb
+++ b/app/models/poll/question.rb
@@ -40,7 +40,7 @@ class Poll::Question < ActiveRecord::Base
   end
 
   def valid_answers
-    (super.try(:split, ',').compact || []).map(&:strip)
+    (super.try(:split, ',')&.compact || []).map(&:strip)
   end
 
   def copy_attributes_from_proposal(proposal)
diff --git a/app/models/poll/total_result.rb b/app/models/poll/total_result.rb
deleted file mode 100644
index 2df01929e..000000000
--- a/app/models/poll/total_result.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-class Poll::TotalResult < ActiveRecord::Base
-
-  VALID_ORIGINS = %w{web booth}
-
-  belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id'
-  belongs_to :booth_assignment
-  belongs_to :officer_assignment
-
-  validates :author, presence: true
-  validates :origin, inclusion: {in: VALID_ORIGINS}
-
-  scope :by_author, ->(author_id) { where(author_id: author_id) }
-
-  before_save :update_logs
-
-  def update_logs
-    if amount_changed? && amount_was.present?
-      self.amount_log += ":#{amount_was.to_s}"
-      self.officer_assignment_id_log += ":#{officer_assignment_id_was.to_s}"
-      self.author_id_log += ":#{author_id_was.to_s}"
-    end
-  end
-end
diff --git a/app/models/poll/voter.rb b/app/models/poll/voter.rb
index bc0118a88..778a5d88a 100644
--- a/app/models/poll/voter.rb
+++ b/app/models/poll/voter.rb
@@ -1,7 +1,7 @@
 class Poll
   class Voter < ActiveRecord::Base
 
-    VALID_ORIGINS = %w{ web booth }
+    VALID_ORIGINS = %w{web booth}.freeze
 
     belongs_to :poll
     belongs_to :user
diff --git a/app/models/poll/white_result.rb b/app/models/poll/white_result.rb
deleted file mode 100644
index a4a4e5a4d..000000000
--- a/app/models/poll/white_result.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-class Poll::WhiteResult < ActiveRecord::Base
-
-  VALID_ORIGINS = %w{web booth}
-
-  belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id'
-  belongs_to :booth_assignment
-  belongs_to :officer_assignment
-
-  validates :author, presence: true
-  validates :origin, inclusion: {in: VALID_ORIGINS}
-
-  scope :by_author, ->(author_id) { where(author_id: author_id) }
-
-  before_save :update_logs
-
-  def update_logs
-    if amount_changed? && amount_was.present?
-      self.amount_log += ":#{amount_was.to_s}"
-      self.officer_assignment_id_log += ":#{officer_assignment_id_was.to_s}"
-      self.author_id_log += ":#{author_id_was.to_s}"
-    end
-  end
-end
diff --git a/app/models/proposal.rb b/app/models/proposal.rb
index 1a688ab30..3b0696d26 100644
--- a/app/models/proposal.rb
+++ b/app/models/proposal.rb
@@ -69,10 +69,10 @@ class Proposal < ActiveRecord::Base
   scope :public_for_api,           -> { all }
 
   def self.recommendations(user)
-    tagged_with(user.interests, any: true).
-    where("author_id != ?", user.id).
-    unsuccessful.
-    not_followed_by_user(user)
+    tagged_with(user.interests, any: true)
+      .where("author_id != ?", user.id)
+      .unsuccessful
+      .not_followed_by_user(user)
   end
 
   def self.not_followed_by_user(user)
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index 21dc7cffb..f2af2c116 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -136,7 +136,7 @@
     <% if feature?(:legislation) %>
       <li class="section-title <%= "active" if controller.class.parent == Admin::Legislation %>">
         <%= link_to admin_legislation_processes_path do %>
-          <span class="icon-edit"></span>
+          <span class="icon-file-text"></span>
           <strong><%= t("admin.menu.legislation") %></strong>
         <% end %>
       </li>
@@ -156,7 +156,7 @@
 
     <li class="section-title">
       <a href="#">
-        <span class="icon-settings"></span>
+        <span class="icon-edit"></span>
         <strong><%= t("admin.menu.title_site_customization") %></strong>
       </a>
       <ul <%= "class=is-active" if menu_customization? &&
@@ -178,6 +178,7 @@
 
     <li class="section-title <%= "active" if controller_name == "geozones" %>">
       <%= link_to admin_geozones_path do %>
+        <span class="icon-map-marker"></span>
         <strong><%= t('admin.menu.geozones') %></strong>
       <% end %>
     </li>
@@ -185,6 +186,7 @@
     <% if feature?(:signature_sheets) %>
       <li class="section-title <%= "active" if controller_name == "signature_sheets" %>">
         <%= link_to admin_signature_sheets_path do %>
+          <span class="icon-file-text-o"></span>
           <strong><%= t("admin.menu.signature_sheets") %></strong>
         <% end %>
       </li>
diff --git a/app/views/admin/comments/index.html.erb b/app/views/admin/comments/index.html.erb
index 75493857c..e07487bcf 100644
--- a/app/views/admin/comments/index.html.erb
+++ b/app/views/admin/comments/index.html.erb
@@ -2,34 +2,46 @@
 
 <%= render 'shared/filter_subnav', i18n_namespace: "admin.comments.index" %>
 
-<h3><%= page_entries_info @comments %></h3>
+<% if @comments.any? %>
+  <h3 class="margin"><%= page_entries_info @comments %></h3>
 
-<table>
-  <% @comments.each do |comment| %>
-    <tr id="<%= dom_id(comment) %>">
-      <td>
-        <%= text_with_links comment.body %><br>
-        <% if comment.commentable.hidden? %>
-          (<%= t("admin.comments.index.hidden_#{comment.commentable_type.downcase}") %>: <%= comment.commentable.title %>)
-        <% else %>
-          <%= link_to comment.commentable.title, comment.commentable %>
-        <% end %>
-      </td>
-      <td class="text-right">
-        <%= link_to t("admin.actions.restore"),
-              restore_admin_comment_path(comment, request.query_parameters),
-              method: :put,
-              data: { confirm: t("admin.actions.confirm") },
-              class: "button hollow on-hover-block" %>
-        <% unless comment.confirmed_hide? %>
-          <%= link_to t("admin.actions.confirm_hide"),
-                confirm_hide_admin_comment_path(comment, request.query_parameters),
+  <table>
+    <thead>
+      <th scope="col" class="small-9"><%= t("admin.shared.description") %></th>
+      <th scope="col"><%= t("admin.shared.actions") %></th>
+    </thead>
+    <tbody>
+    <% @comments.each do |comment| %>
+      <tr id="<%= dom_id(comment) %>">
+        <td>
+          <%= text_with_links comment.body %><br>
+          <% if comment.commentable.hidden? %>
+            (<%= t("admin.comments.index.hidden_#{comment.commentable_type.downcase}") %>: <%= comment.commentable.title %>)
+          <% else %>
+            <%= link_to comment.commentable.title, comment.commentable %>
+          <% end %>
+        </td>
+        <td>
+          <%= link_to t("admin.actions.restore"),
+                restore_admin_comment_path(comment, request.query_parameters),
                 method: :put,
-                class: "button hollow warning on-hover-block" %>
-        <% end %>
-      </td>
-    </tr>
-  <% end %>
-</table>
+                data: { confirm: t("admin.actions.confirm") },
+                class: "button hollow warning" %>
+          <% unless comment.confirmed_hide? %>
+            <%= link_to t("admin.actions.confirm_hide"),
+                  confirm_hide_admin_comment_path(comment, request.query_parameters),
+                  method: :put,
+                  class: "button" %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
 
-<%= paginate @comments %>
+  <%= paginate @comments %>
+<% else %>
+  <div class="callout primary margin">
+    <%= t("admin.comments.index.no_hidden_comments") %>
+  </div>
+<% end %>
diff --git a/app/views/admin/debates/index.html.erb b/app/views/admin/debates/index.html.erb
index 987aa6e72..7715e1032 100644
--- a/app/views/admin/debates/index.html.erb
+++ b/app/views/admin/debates/index.html.erb
@@ -2,33 +2,47 @@
 
 <%= render 'shared/filter_subnav', i18n_namespace: "admin.debates.index" %>
 
-<h3><%= page_entries_info @debates %></h3>
+<% if @debates.any? %>
+  <h3 class="margin"><%= page_entries_info @debates %></h3>
 
-<table>
-  <% @debates.each do |debate| %>
-    <tr id="<%= dom_id(debate) %>">
-      <td>
-        <strong><%= debate.title %></strong>
-        <br>
-        <div class="moderation-description">
-          <%= debate.description %>
-        </div>
-      </td>
-      <td class="text-right">
-        <%= link_to t("admin.actions.restore"),
-              restore_admin_debate_path(debate, request.query_parameters),
-              method: :put,
-              data: { confirm: t("admin.actions.confirm") },
-              class: "button hollow on-hover" %>
-        <% unless debate.confirmed_hide? %>
-          <%= link_to t("admin.actions.confirm_hide"),
-                confirm_hide_admin_debate_path(debate, request.query_parameters),
+  <table>
+    <thead>
+      <th scope="col"><%= t("admin.shared.title") %></th>
+      <th scope="col" class="small-6"><%= t("admin.shared.description") %></th>
+      <th scope="col" class="small-3"><%= t("admin.shared.actions") %></th>
+    </thead>
+    <tbody>
+    <% @debates.each do |debate| %>
+      <tr id="<%= dom_id(debate) %>">
+        <td class="align-top">
+          <strong><%= debate.title %></strong>
+        </td>
+        <td>
+          <div class="moderation-description">
+            <%= debate.description %>
+          </div>
+        </td>
+        <td class="align-top">
+          <%= link_to t("admin.actions.restore"),
+                restore_admin_debate_path(debate, request.query_parameters),
                 method: :put,
-                class: "button hollow warning on-hover" %>
-        <% end %>
-      </td>
-    </tr>
-  <% end %>
-</table>
+                data: { confirm: t("admin.actions.confirm") },
+                class: "button hollow warning" %>
+          <% unless debate.confirmed_hide? %>
+            <%= link_to t("admin.actions.confirm_hide"),
+                  confirm_hide_admin_debate_path(debate, request.query_parameters),
+                  method: :put,
+                  class: "button" %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
 
-<%= paginate @debates %>
+  <%= paginate @debates %>
+<% else %>
+  <div class="callout primary margin">
+    <%= t("admin.debates.index.no_hidden_debates") %>
+  </div>
+<% end %>
diff --git a/app/views/admin/hidden_users/index.html.erb b/app/views/admin/hidden_users/index.html.erb
index 21bf016e4..6bcea253c 100644
--- a/app/views/admin/hidden_users/index.html.erb
+++ b/app/views/admin/hidden_users/index.html.erb
@@ -2,32 +2,42 @@
 
 <%= render 'shared/filter_subnav', i18n_namespace: "admin.hidden_users.index" %>
 
-<h3><%= page_entries_info @users %></h3>
+<% if @users.any? %>
+  <h3 class="margin"><%= page_entries_info @users %></h3>
 
-<table>
-<% @users.each do |user| %>
-  <tr id="<%= dom_id(user) %>">
-    <td>
-      <p><%= link_to user.name, admin_hidden_user_path(user) %></p>
-    </td>
+  <table>
+    <thead>
+      <th scope="col" class="small-9"><%= t("admin.hidden_users.index.user") %></th>
+      <th scope="col"><%= t("admin.shared.actions") %></th>
+    </thead>
+    <tbody>
+    <% @users.each do |user| %>
+      <tr id="<%= dom_id(user) %>">
+        <td>
+          <p><%= link_to user.name, admin_hidden_user_path(user) %></p>
+        </td>
 
-    <td class="text-right">
-      <%= link_to t("admin.actions.restore"),
-            restore_admin_hidden_user_path(user, request.query_parameters),
-            method: :put,
-            data: { confirm: t("admin.actions.confirm") },
-            class: "button hollow on-hover" %>
-      <% unless user.confirmed_hide? %>
-        <%= link_to t("admin.actions.confirm_hide"),
-            confirm_hide_admin_hidden_user_path(user, request.query_parameters),
-            method: :put,
-            class: "button hollow warning on-hover" %>
-      <% end %>
-    </td>
-  </tr>
+        <td>
+          <%= link_to t("admin.actions.restore"),
+                restore_admin_hidden_user_path(user, request.query_parameters),
+                method: :put,
+                data: { confirm: t("admin.actions.confirm") },
+                class: "button hollow warning" %>
+          <% unless user.confirmed_hide? %>
+            <%= link_to t("admin.actions.confirm_hide"),
+                confirm_hide_admin_hidden_user_path(user, request.query_parameters),
+                method: :put,
+                class: "button" %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
+
+  <%= paginate @users %>
+<% else %>
+ <div class="callout primary margin">
+    <%= t("admin.hidden_users.index.no_hidden_users") %>
+  </div>
 <% end %>
-</table>
-
-<%= paginate @users %>
-
-
diff --git a/app/views/admin/legislation/processes/_subnav.html.erb b/app/views/admin/legislation/processes/_subnav.html.erb
index 97640c4f4..f8e9bba56 100644
--- a/app/views/admin/legislation/processes/_subnav.html.erb
+++ b/app/views/admin/legislation/processes/_subnav.html.erb
@@ -1,11 +1,31 @@
 <ul class="menu simple clear">
-  <li <%= "class=active" if active == 'info' %>>
-    <%= link_to t("admin.legislation.processes.subnav.info"), edit_admin_legislation_process_path(process) %>
-  </li>
-    <li <%= "class=active" if active == 'questions' %>>
-    <%= link_to t("admin.legislation.processes.subnav.questions"), admin_legislation_process_questions_path(process) %>
-  </li>
-  <li <%= "class=active" if active == 'draft_versions' %>>
-    <%= link_to t("admin.legislation.processes.subnav.draft_texts"), admin_legislation_process_draft_versions_path(process) %>
-  </li>
+  <% if active == 'info' %>
+    <li class="active">
+      <h2><%= t("admin.legislation.processes.subnav.info") %></h2>
+    </li>
+  <% else %>
+    <li>
+      <%= link_to t("admin.legislation.processes.subnav.info"), edit_admin_legislation_process_path(process) %>
+    </li>
+  <% end %>
+
+  <% if active == 'questions' %>
+    <li class="active">
+      <h2><%= t("admin.legislation.processes.subnav.questions") %></h2>
+    </li>
+  <% else %>
+    <li>
+      <%= link_to t("admin.legislation.processes.subnav.questions"), admin_legislation_process_questions_path(process) %>
+    </li>
+  <% end %>
+
+  <% if active == 'draft_versions' %>
+    <li class="active">
+      <h2><%= t("admin.legislation.processes.subnav.draft_texts") %></h2>
+    </li>
+  <% else %>
+    <li>
+      <%= link_to t("admin.legislation.processes.subnav.draft_texts"), admin_legislation_process_draft_versions_path(process) %>
+    </li>
+  <% end %>
 </ul>
diff --git a/app/views/admin/poll/officer_assignments/index.html.erb b/app/views/admin/poll/officer_assignments/index.html.erb
index f27f6b2ae..04e296980 100644
--- a/app/views/admin/poll/officer_assignments/index.html.erb
+++ b/app/views/admin/poll/officer_assignments/index.html.erb
@@ -11,7 +11,7 @@
       <%= t("admin.poll_officer_assignments.index.no_officers") %>
     </div>
   <% else %>
-    <table class="fixed margin">
+    <table class="fixed margin" id="officer_assignments">
       <thead>
         <th><%= t("admin.poll_officer_assignments.index.table_name") %></th>
         <th><%= t("admin.poll_officer_assignments.index.table_email") %></th>
diff --git a/app/views/admin/poll/shifts/_form.html.erb b/app/views/admin/poll/shifts/_form.html.erb
index 1a13edf45..4004a949b 100644
--- a/app/views/admin/poll/shifts/_form.html.erb
+++ b/app/views/admin/poll/shifts/_form.html.erb
@@ -24,12 +24,12 @@
     <div class="small-12 medium-3 column">
       <label><%= t("admin.poll_shifts.new.date") %></label>
       <%= select 'shift[date]', 'vote_collection_date',
-                  options_for_select(shift_vote_collection_dates(@booth.polls)),
+                  options_for_select(shift_vote_collection_dates(@booth.polls.current_or_incoming)),
                   { prompt: t("admin.poll_shifts.new.select_date"),
                   label: false },
                   class: 'js-shift-vote-collection-dates' %>
       <%= select 'shift[date]', 'recount_scrutiny_date',
-                  options_for_select(shift_recount_scrutiny_dates(@booth.polls)),
+                  options_for_select(shift_recount_scrutiny_dates(@booth.polls.current_or_recounting_or_incoming)),
                   { prompt: t("admin.poll_shifts.new.select_date"),
                   label: false },
                   class: 'js-shift-recount-scrutiny-dates',
diff --git a/app/views/admin/poll/shifts/new.html.erb b/app/views/admin/poll/shifts/new.html.erb
index b975c40a9..4e0665ea2 100644
--- a/app/views/admin/poll/shifts/new.html.erb
+++ b/app/views/admin/poll/shifts/new.html.erb
@@ -1,4 +1,4 @@
-<%= back_link_to admin_booths_path %>
+<%= back_link_to available_admin_booths_path %>
 
 <h2><%= @booth.name %></h2>
 
diff --git a/app/views/admin/proposals/index.html.erb b/app/views/admin/proposals/index.html.erb
index d929843b1..ba161ce77 100644
--- a/app/views/admin/proposals/index.html.erb
+++ b/app/views/admin/proposals/index.html.erb
@@ -2,41 +2,55 @@
 
 <%= render 'shared/filter_subnav', i18n_namespace: "admin.proposals.index" %>
 
-<h3><%= page_entries_info @proposals %></h3>
+<% if @proposals.any? %>
+  <h3 class="margin"><%= page_entries_info @proposals %></h3>
 
-<table>
-  <% @proposals.each do |proposal| %>
-    <tr id="<%= dom_id(proposal) %>">
-      <td>
-        <strong><%= proposal.title %></strong>
-        <br>
-        <div class="moderation-description">
-          <p><%= proposal.summary %></p>
-          <%= proposal.description %>
-          <% if proposal.external_url.present? %>
-            <p><%= text_with_links proposal.external_url %></p>
-          <% end %>
-          <% if proposal.video_url.present? %>
-            <p><%= text_with_links proposal.video_url %></p>
-          <% end %>
-          <p><%= proposal.question %></p>
-        </div>
-      </td>
-      <td class="text-right">
-        <%= link_to t("admin.actions.restore"),
-              restore_admin_proposal_path(proposal, request.query_parameters),
-              method: :put,
-              data: { confirm: t("admin.actions.confirm") },
-              class: "button hollow on-hover-block" %>
-        <% unless proposal.confirmed_hide? %>
-          <%= link_to t("admin.actions.confirm_hide"),
-                confirm_hide_admin_proposal_path(proposal, request.query_parameters),
+  <table>
+    <thead>
+      <th scope="col"><%= t("admin.shared.title") %></th>
+      <th scope="col" class="small-6"><%= t("admin.shared.description") %></th>
+      <th scope="col" class="small-3"><%= t("admin.shared.actions") %></th>
+    </thead>
+    <tbody>
+    <% @proposals.each do |proposal| %>
+      <tr id="<%= dom_id(proposal) %>">
+        <td class="align-top">
+          <strong><%= proposal.title %></strong>
+        </td>
+        <td>
+          <div class="moderation-description">
+            <p><small><%= proposal.summary %></small></p>
+            <%= proposal.description %>
+            <% if proposal.external_url.present? %>
+              <p><%= text_with_links proposal.external_url %></p>
+            <% end %>
+            <% if proposal.video_url.present? %>
+              <p><%= text_with_links proposal.video_url %></p>
+            <% end %>
+            <p><%= proposal.question %></p>
+          </div>
+        </td>
+        <td class="align-top">
+          <%= link_to t("admin.actions.restore"),
+                restore_admin_proposal_path(proposal, request.query_parameters),
                 method: :put,
-                class: "button hollow warning on-hover-block" %>
-        <% end %>
-      </td>
-    </tr>
-  <% end %>
-</table>
+                data: { confirm: t("admin.actions.confirm") },
+                class: "button hollow warning" %>
+          <% unless proposal.confirmed_hide? %>
+            <%= link_to t("admin.actions.confirm_hide"),
+                  confirm_hide_admin_proposal_path(proposal, request.query_parameters),
+                  method: :put,
+                  class: "button" %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
 
-<%= paginate @proposals %>
+  <%= paginate @proposals %>
+<% else %>
+  <div class="callout primary margin">
+    <%= t("admin.proposals.index.no_hidden_proposals") %>
+  </div>
+<% end %>
diff --git a/app/views/admin/tags/index.html.erb b/app/views/admin/tags/index.html.erb
index f22321f38..55e51a8ac 100644
--- a/app/views/admin/tags/index.html.erb
+++ b/app/views/admin/tags/index.html.erb
@@ -1,39 +1,40 @@
 <h2><%= t("admin.tags.index.add_tag") %></h2>
 
 <%= form_for(@tag, url: admin_tags_path, as: :tag) do |f| %>
-
-  <div class="row">
-    <div class="small-12 medium-6 column">
-      <%= f.label :name, t("admin.tags.name.placeholder") %>
-      <%= f.text_field :name, placeholder: t("admin.tags.name.placeholder"), label: false  %>
-    </div>
-
+  <div class="small-12 medium-6">
+    <%= f.label :name, t("admin.tags.name.placeholder") %>
+    <%= f.text_field :name, placeholder: t("admin.tags.name.placeholder"), label: false  %>
   </div>
 
   <%= f.submit(t("admin.tags.create"), class: "button success") %>
-
 <% end %>
 
-<h3><%= t("admin.tags.index.title") %>: <%= page_entries_info @tags %></h3>
+<hr>
+<h3 class="margin"><%= t("admin.tags.index.title") %>: <%= page_entries_info @tags %></h3>
 
 <table>
+  <thead>
+    <th scope="col" class="small-9"><%= t("admin.tags.index.topic") %></th>
+    <th scope="col"><%= t("admin.actions.actions") %></th>
+  </thead>
+  <tbody>
   <% @tags.each do |tag| %>
     <tr>
-      <td class="with-button">
+      <td>
         <%= form_for(tag,
             url: admin_tag_path(tag),
             as: :tag,
-            html: { id: "edit_tag_#{tag.id}", class: "text-right"}) do |f| %>
+            html: { id: "edit_tag_#{tag.id}"}) do |f| %>
 
-            <span class="float-left text-left">
-              <strong><%= tag.name %></strong>
-            </span>
-
-            <%= link_to t("admin.tags.destroy"), admin_tag_path(tag), method: :delete, class: "button hollow alert on-hover" %>
+            <strong><%= tag.name %></strong>
         <% end %>
       </td>
+      <td id="tag_<%= tag.id %>">
+        <%= link_to t("admin.tags.destroy"), admin_tag_path(tag), method: :delete, class: "button hollow alert" %>
+      </td>
     </tr>
   <% end %>
+  </tbody>
 </table>
 
 <%= paginate @tags %>
diff --git a/app/views/devise/menu/_login_items.html.erb b/app/views/devise/menu/_login_items.html.erb
index ac2f7e33c..186597bc6 100644
--- a/app/views/devise/menu/_login_items.html.erb
+++ b/app/views/devise/menu/_login_items.html.erb
@@ -6,8 +6,14 @@
         <span class="icon-circle" aria-hidden="true"></span>
         <span class="icon-notification" aria-hidden="true" title="<%= t('layouts.header.new_notifications', count: current_user.notifications_count).html_safe %>">
         </span>
+        <small class="show-for-small-only">
+          <%= t('layouts.header.new_notifications', count: current_user.notifications_count).html_safe %>
+        </small>
       <% else %>
         <span class="icon-no-notification" aria-hidden="true" title="<%= t('layouts.header.no_notifications') %>"></span>
+        <small class="show-for-small-only">
+          <%= t('layouts.header.no_notifications') %>
+        </small>
       <% end %>
     <% end %>
   </li>
diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb
index e9ccdd998..96f4ada85 100644
--- a/app/views/layouts/_admin_header.html.erb
+++ b/app/views/layouts/_admin_header.html.erb
@@ -8,7 +8,7 @@
   <div class="expanded row">
     <div class="top-bar">
 
-      <span data-responsive-toggle="responsive-menu" data-hide-for="medium" class="float-right">
+      <span data-responsive-toggle="responsive_menu" data-hide-for="medium" class="float-right">
         <span class="menu-icon dark" data-toggle></span>
         <%= t("application.menu")%>
       </span>
@@ -22,10 +22,10 @@
             <% end %>
           </h1>
         </div>
-        <div id="responsive-menu">
+        <div id="responsive_menu">
 
         <div class="top-bar-right">
-          <ul class="dropdown menu" data-dropdown-menu>
+          <ul class="menu" data-responsive-menu="medium-dropdown">
             <%= render "admin/shared/admin_shortcuts" %>
             <%= render "shared/admin_login_items" %>
             <%= render "devise/menu/login_items" %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 304c5c954..487707079 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -14,12 +14,12 @@
 
       <%= link_to setting['org_name'], root_path, class: "logo show-for-small-only" %>
 
-      <span data-responsive-toggle="responsive-menu" data-hide-for="medium" class="float-right">
+      <span data-responsive-toggle="responsive_menu" data-hide-for="medium" class="float-right">
         <span class="menu-icon dark" data-toggle></span>
         <%= t("application.menu")%>
       </span>
 
-      <div id="responsive-menu">
+      <div id="responsive_menu">
         <div class="top-bar-title">
           <%= link_to root_path, class: "hide-for-small-only", accesskey: "0" do %>
             <%= image_tag(image_path_for('logo_header.png'), class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
@@ -28,7 +28,7 @@
         </div>
 
         <div class="top-bar-right">
-          <ul class="dropdown menu" data-dropdown-menu>
+          <ul class="menu" data-responsive-menu="medium-dropdown">
             <%= render "shared/admin_login_items" %>
             <%= render "devise/menu/login_items" %>
           </ul>
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index c0e36ba0e..351c04b76 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -18,10 +18,6 @@
       <div class="off-canvas-wrapper-inner" data-off-canvas-wrapper>
         <div class="off-canvas position-left" id="offCanvas" data-off-canvas>
 
-          <button class="close-button" aria-label="Close menu" type="button" data-close>
-            <span aria-hidden="true">&times;</span>
-          </button>
-
           <div class="show-for-small-only">
             <%= side_menu %>
           </div>
diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb
index f92bc8dfc..7b4a5f26d 100644
--- a/app/views/layouts/management.html.erb
+++ b/app/views/layouts/management.html.erb
@@ -15,30 +15,25 @@
   </head>
 
   <body class="admin">
-    <header>
-      <section class="top-links">
+    <header class="header">
+      <div class="top-links">
         <div class="expanded row">
           <%= render 'shared/locale_switcher' %>
         </div>
-      </section>
+      </div>
 
       <div class="expanded row">
         <div class="top-bar">
 
           <%= link_to setting['org_name'], management_root_path, class: "logo show-for-small-only" %>
 
-          <span data-responsive-toggle="responsive-menu" data-hide-for="medium" class="float-right">
-            <span class="menu-icon dark" data-toggle></span>
-            <%= t("application.menu")%>
-          </span>
-
-          <div id="responsive-menu">
             <div class="top-bar-title">
-              <%= link_to management_root_path, class: "hide-for-small-only" do %>
-                <%= image_tag(image_path_for('logo_header.png'), class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
-                <%= setting['org_name'] %>
-                &nbsp;|&nbsp;<%= t("management.dashboard.index.title") %>
-              <% end %>
+              <h1>
+                <%= link_to management_root_path do %>
+                  <%= setting['org_name'] %>
+                  <br><small><%= t("management.dashboard.index.title") %></small>
+                <% end %>
+              </h1>
             </div>
           </div>
         </div>
diff --git a/app/views/officing/voters/_already_voted.html.erb b/app/views/officing/voters/_already_voted.html.erb
index 1af002b3f..cc144eb09 100644
--- a/app/views/officing/voters/_already_voted.html.erb
+++ b/app/views/officing/voters/_already_voted.html.erb
@@ -3,6 +3,5 @@
     <strong><%= t("officing.voters.show.error_already_voted") %></strong>
   </p>
 </td>
-<td class="text-center">
-  <small><%= t("officing.voters.show.no_actions") %></small>
+<td>
 </td>
diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb
index e4e11af6f..9f3e36c75 100644
--- a/app/views/polls/show.html.erb
+++ b/app/views/polls/show.html.erb
@@ -31,9 +31,27 @@
     
   <div class="tabs-content" data-tabs-content="polls-tabs" role="tablist">
     <%= render "results_subnavigation" %>
+        <% if current_user && @poll.voted_in_web?(current_user) %>
+        <div class="small-12 medium-6 column end answer <%= cycle('first', '') %>" id="answer_<%= answer.id %>">
 
     <div id="tab-stats" class="tabs-panel">
       <%= render "polls/stats/show" %>    
+                              target: "_blank",
+                              rel: "nofollow" %><br>
+              <% end %>
+            </div>
+          <% end %>
+
+          <% if answer.videos.present? %>
+            <div class="video-link">
+              <p>
+                <span class="icon-video"></span>&nbsp;
+                <strong><%= t("polls.show.videos") %></strong>
+              </p>
+
+              <% answer.videos.each do |video| %>
+                  <%= link_to video.title,
+                              video.url,
     </div>
     <div id="tab-information" class="tabs-panel is-active">
       <%= render "show" %>    
diff --git a/app/views/shared/_admin_login_items.html.erb b/app/views/shared/_admin_login_items.html.erb
index 5ba498523..9634874f9 100644
--- a/app/views/shared/_admin_login_items.html.erb
+++ b/app/views/shared/_admin_login_items.html.erb
@@ -1,6 +1,6 @@
 <% if show_admin_menu? %>
   <li>
-    <%= link_to t("layouts.header.administration_menu"), "#", rel: "nofollow" %>
+    <%= link_to t("layouts.header.administration_menu"), "#", rel: "nofollow", class: "hide-for-small-only" %>
     <ul class="menu">
       <% if current_user.administrator? %>
         <li>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 0ea0f748d..e27f4436e 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -22,12 +22,12 @@
   <%= render "recommended",
               recommended_debates: @recommended_debates,
               recommended_proposals: @recommended_proposals %>
+  <hr>
 <% end %>
 
 <% cache [locale_and_user_status, @featured_debates, @featured_proposals, 'featured'] do %>
   <main>
-
-    <div class="small-12 column text-center <%= highlight_background %>">
+    <div class="small-12 column text-center">
       <div class="row margin padding">
         <div class="small-12 medium-3 column">
           <h2><%= t("welcome.debates.title") %></h2>
@@ -47,6 +47,5 @@
         </div>
       </div>
     </div>
-
   </main>
 <% end %>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index dfe92305d..87bbb6685 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -213,6 +213,7 @@ en:
         hidden_debate: Hidden debate
         hidden_proposal: Hidden proposal
         title: Hidden comments
+        no_hidden_comments: There is no hidden comments.
     dashboard:
       index:
         back: Go back to %{org}
@@ -226,6 +227,7 @@ en:
           with_confirmed_hide: Confirmed
           without_confirmed_hide: Pending
         title: Hidden debates
+        no_hidden_debates: There is no hidden debates.
     hidden_users:
       index:
         filter: Filter
@@ -234,6 +236,8 @@ en:
           with_confirmed_hide: Confirmed
           without_confirmed_hide: Pending
         title: Hidden users
+        user: User
+        no_hidden_users: There is no hidden users.
       show:
         email: 'Email:'
         hidden_at: 'Hidden at:'
@@ -715,6 +719,7 @@ en:
           with_confirmed_hide: Confirmed
           without_confirmed_hide: Pending
         title: Hidden proposals
+        no_hidden_proposals: There is no hidden proposals.
     settings:
       flash:
         updated: Value updated
@@ -757,6 +762,9 @@ en:
         placeholder: Search user by name or email
       search_results: "Search results"
       no_search_results: "No results found."
+      actions: Actions
+      title: Title
+      description: Description
     spending_proposals:
       index:
         geozone_filter_all: All zones
@@ -901,11 +909,12 @@ en:
         total: Total
         proposals_with_notifications: Proposals with notifications
     tags:
-      create: Create Topic
-      destroy: Destroy Topic
+      create: Create topic
+      destroy: Destroy topic
       index:
         add_tag: Add a new proposal topic
         title: Proposal topics
+        topic: Topic
       name:
         placeholder: Type the name of the topic
     users:
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index 6867a1aa1..716276eb0 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -497,6 +497,7 @@ en:
       read_more: "Read more about %{answer}"
       read_less: "Read less about %{answer}"
       participate_in_other_polls: Participate in other polls
+      videos: "External video"
       info_menu: "Information"
       stats_menu: "Participation statistics"
       stats:
diff --git a/config/locales/en/officing.yml b/config/locales/en/officing.yml
index bb9ef6bd2..9837e7b86 100644
--- a/config/locales/en/officing.yml
+++ b/config/locales/en/officing.yml
@@ -63,7 +63,6 @@ en:
       show:
         can_vote: Can vote
         error_already_voted: Has already participated in this poll
-        no_actions: There is no available actions
         submit: Confirm vote
         success: "Vote introduced!"
       can_vote:
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index 289546bab..d1a24b314 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -213,6 +213,7 @@ es:
         hidden_debate: Debate oculto
         hidden_proposal: Propuesta oculta
         title: Comentarios ocultos
+        no_hidden_comments: No hay comentarios ocultos.
     dashboard:
       index:
         back: Volver a %{org}
@@ -226,6 +227,7 @@ es:
           with_confirmed_hide: Confirmados
           without_confirmed_hide: Pendientes
         title: Debates ocultos
+        no_hidden_debates: No hay debates ocultos.
     hidden_users:
       index:
         filter: Filtro
@@ -234,6 +236,8 @@ es:
           with_confirmed_hide: Confirmados
           without_confirmed_hide: Pendientes
         title: Usuarios bloqueados
+        user: Usuario
+        no_hidden_users: No hay uusarios bloqueados.
       show:
         email: 'Email:'
         hidden_at: 'Bloqueado:'
@@ -717,6 +721,7 @@ es:
           with_confirmed_hide: Confirmadas
           without_confirmed_hide: Pendientes
         title: Propuestas ocultas
+        no_hidden_proposals: No hay propuestas ocultas.
     settings:
       flash:
         updated: Valor actualizado
@@ -759,6 +764,9 @@ es:
         placeholder: Buscar usuario por nombre o email
       search_results: "Resultados de la búsqueda"
       no_search_results: "No se han encontrado resultados."
+      actions: Acciones
+      title: "Título"
+      description: "Descripción"
     spending_proposals:
       index:
         geozone_filter_all: Todos los ámbitos de actuación
@@ -903,11 +911,12 @@ es:
         total: Total
         proposals_with_notifications: Propuestas con notificaciones
     tags:
-      create: Crear Tema
-      destroy: Eliminar Tema
+      create: Crear tema
+      destroy: Eliminar tema
       index:
         add_tag: Añade un nuevo tema de propuesta
         title: Temas de propuesta
+        topic: Tema
       name:
         placeholder: Escribe el nombre del tema
     users:
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index 38f4077c7..6e2b54475 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -497,6 +497,7 @@ es:
       read_more: "Leer más sobre %{answer}"
       read_less: "Leer menos sobre %{answer}"
       participate_in_other_polls: Participar en otras votaciones
+      videos: "Vídeo externo"
       info_menu: "Información"
       stats_menu: "Estadísticas de participación"
       stats:
diff --git a/config/locales/es/officing.yml b/config/locales/es/officing.yml
index 86d6982fc..b16196382 100644
--- a/config/locales/es/officing.yml
+++ b/config/locales/es/officing.yml
@@ -63,8 +63,7 @@ es:
       show:
         can_vote: Puede votar
         error_already_voted: "Ya ha participado en esta votación"
-        no_actions: No hay acciones disponibles
         submit: Confirmar voto
         success: "¡Voto introducido!"
       can_vote:
-        submit_disable_with: "Espera, confirmando voto..."
\ No newline at end of file
+        submit_disable_with: "Espera, confirmando voto..."
diff --git a/db/migrate/20171002133547_remove_poll_white_null_total_results.rb b/db/migrate/20171002133547_remove_poll_white_null_total_results.rb
new file mode 100644
index 000000000..5fff82ef3
--- /dev/null
+++ b/db/migrate/20171002133547_remove_poll_white_null_total_results.rb
@@ -0,0 +1,16 @@
+class RemovePollWhiteNullTotalResults < ActiveRecord::Migration
+  def change
+    remove_index :poll_null_results, column: [:booth_assignment_id]
+    remove_index :poll_null_results, column: [:officer_assignment_id]
+
+    remove_index :poll_white_results, column: [:booth_assignment_id]
+    remove_index :poll_white_results, column: [:officer_assignment_id]
+
+    remove_index :poll_total_results, column: [:booth_assignment_id]
+    remove_index :poll_total_results, column: [:officer_assignment_id]
+
+    drop_table :poll_null_results
+    drop_table :poll_total_results
+    drop_table :poll_white_results
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b9a1524ab..8a03412be 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -613,21 +613,6 @@ ActiveRecord::Schema.define(version: 20171010143623) do
     t.string "location"
   end
 
-  create_table "poll_null_results", force: :cascade do |t|
-    t.integer "author_id"
-    t.integer "amount"
-    t.string  "origin"
-    t.date    "date"
-    t.integer "booth_assignment_id"
-    t.integer "officer_assignment_id"
-    t.text    "amount_log",                default: ""
-    t.text    "officer_assignment_id_log", default: ""
-    t.text    "author_id_log",             default: ""
-  end
-
-  add_index "poll_null_results", ["booth_assignment_id"], name: "index_poll_null_results_on_booth_assignment_id", using: :btree
-  add_index "poll_null_results", ["officer_assignment_id"], name: "index_poll_null_results_on_officer_assignment_id", using: :btree
-
   create_table "poll_officer_assignments", force: :cascade do |t|
     t.integer  "booth_assignment_id"
     t.integer  "officer_id"
@@ -739,21 +724,6 @@ ActiveRecord::Schema.define(version: 20171010143623) do
   add_index "poll_shifts", ["booth_id"], name: "index_poll_shifts_on_booth_id", using: :btree
   add_index "poll_shifts", ["officer_id"], name: "index_poll_shifts_on_officer_id", using: :btree
 
-  create_table "poll_total_results", force: :cascade do |t|
-    t.integer "author_id"
-    t.integer "amount"
-    t.string  "origin"
-    t.date    "date"
-    t.integer "booth_assignment_id"
-    t.integer "officer_assignment_id"
-    t.text    "amount_log",                default: ""
-    t.text    "officer_assignment_id_log", default: ""
-    t.text    "author_id_log",             default: ""
-  end
-
-  add_index "poll_total_results", ["booth_assignment_id"], name: "index_poll_total_results_on_booth_assignment_id", using: :btree
-  add_index "poll_total_results", ["officer_assignment_id"], name: "index_poll_total_results_on_officer_assignment_id", using: :btree
-
   create_table "poll_voters", force: :cascade do |t|
     t.string   "document_number"
     t.string   "document_type"
@@ -779,21 +749,6 @@ ActiveRecord::Schema.define(version: 20171010143623) do
   add_index "poll_voters", ["poll_id"], name: "index_poll_voters_on_poll_id", using: :btree
   add_index "poll_voters", ["user_id"], name: "index_poll_voters_on_user_id", using: :btree
 
-  create_table "poll_white_results", force: :cascade do |t|
-    t.integer "author_id"
-    t.integer "amount"
-    t.string  "origin"
-    t.date    "date"
-    t.integer "booth_assignment_id"
-    t.integer "officer_assignment_id"
-    t.text    "amount_log",                default: ""
-    t.text    "officer_assignment_id_log", default: ""
-    t.text    "author_id_log",             default: ""
-  end
-
-  add_index "poll_white_results", ["booth_assignment_id"], name: "index_poll_white_results_on_booth_assignment_id", using: :btree
-  add_index "poll_white_results", ["officer_assignment_id"], name: "index_poll_white_results_on_officer_assignment_id", using: :btree
-
   create_table "polls", force: :cascade do |t|
     t.string   "name"
     t.datetime "starts_at"
@@ -1158,8 +1113,6 @@ ActiveRecord::Schema.define(version: 20171010143623) do
   add_foreign_key "organizations", "users"
   add_foreign_key "poll_answers", "poll_questions", column: "question_id"
   add_foreign_key "poll_booth_assignments", "polls"
-  add_foreign_key "poll_null_results", "poll_booth_assignments", column: "booth_assignment_id"
-  add_foreign_key "poll_null_results", "poll_officer_assignments", column: "officer_assignment_id"
   add_foreign_key "poll_officer_assignments", "poll_booth_assignments", column: "booth_assignment_id"
   add_foreign_key "poll_partial_results", "poll_booth_assignments", column: "booth_assignment_id"
   add_foreign_key "poll_partial_results", "poll_officer_assignments", column: "officer_assignment_id"
@@ -1173,8 +1126,6 @@ ActiveRecord::Schema.define(version: 20171010143623) do
   add_foreign_key "poll_recounts", "poll_booth_assignments", column: "booth_assignment_id"
   add_foreign_key "poll_recounts", "poll_officer_assignments", column: "officer_assignment_id"
   add_foreign_key "poll_voters", "polls"
-  add_foreign_key "poll_white_results", "poll_booth_assignments", column: "booth_assignment_id"
-  add_foreign_key "poll_white_results", "poll_officer_assignments", column: "officer_assignment_id"
   add_foreign_key "proposals", "communities"
   add_foreign_key "users", "geozones"
   add_foreign_key "valuators", "users"
diff --git a/knapsack_rspec_report.json b/knapsack_rspec_report.json
index 595276b2b..5f1fc06b5 100644
--- a/knapsack_rspec_report.json
+++ b/knapsack_rspec_report.json
@@ -1,226 +1,227 @@
 {
-  "spec/helpers/comments_helper_spec.rb": 0.010898828506469727,
-  "spec/controllers/graphql_controller_spec.rb": 0.7817962169647217,
-  "spec/controllers/concerns/has_orders_spec.rb": 0.09597063064575195,
-  "spec/features/officing/results_spec.rb": 2.6492855548858643,
-  "spec/models/poll/question_spec.rb": 0.09519433975219727,
-  "spec/features/organizations_spec.rb": 1.9025108814239502,
-  "spec/models/legislation/process_spec.rb": 0.09253501892089844,
-  "spec/lib/acts_as_paranoid_aliases_spec.rb": 0.2438969612121582,
-  "spec/features/officing_spec.rb": 1.4767742156982422,
-  "spec/lib/age_spec.rb": 0.0006227493286132812,
-  "spec/models/proposal_spec.rb": 5.535696983337402,
-  "spec/models/abilities/administrator_spec.rb": 2.2431821823120117,
-  "spec/models/poll/final_recount_spec.rb": 0.1787703037261963,
-  "spec/lib/graph_ql/query_type_creator_spec.rb": 0.012041091918945312,
-  "spec/models/verification/management/email_spec.rb": 0.06403493881225586,
-  "spec/models/flag_spec.rb": 0.46442556381225586,
-  "spec/features/tags/budget_investments_spec.rb": 23.748523235321045,
-  "spec/features/campaigns_spec.rb": 1.3289697170257568,
-  "spec/features/admin/activity_spec.rb": 7.763890743255615,
-  "spec/features/polls/questions_spec.rb": 2.61055326461792,
-  "spec/features/polls/polls_spec.rb": 2.313369035720825,
-  "spec/features/home_spec.rb": 0.9780440330505371,
-  "spec/models/poll/partial_result_spec.rb": 0.3302469253540039,
-  "spec/models/lock_spec.rb": 0.09437012672424316,
-  "spec/lib/graph_ql/api_types_creator_spec.rb": 0.0069005489349365234,
-  "spec/helpers/users_helper_spec.rb": 0.3229796886444092,
-  "spec/lib/local_census_spec.rb": 0.011091947555541992,
-  "spec/helpers/text_helper_spec.rb": 0.0005347728729248047,
-  "spec/customization_engine_spec.rb": 1.3630127906799316,
-  "spec/models/legislation/answer_spec.rb": 0.6906075477600098,
-  "spec/models/budget/ballot/line_spec.rb": 0.5054352283477783,
-  "spec/features/admin/proposals_spec.rb": 1.6710176467895508,
-  "spec/features/proposal_ballots_spec.rb": 0.3399386405944824,
-  "spec/models/site_customization/content_block_spec.rb": 0.014521121978759766,
-  "spec/features/admin/site_customization/content_blocks_spec.rb": 1.2890841960906982,
-  "spec/models/site_customization/page_spec.rb": 0.011090993881225586,
-  "spec/features/verification/email_spec.rb": 1.0991628170013428,
-  "spec/models/proposal_notification_spec.rb": 0.2569601535797119,
-  "spec/features/registration_form_spec.rb": 0.7285032272338867,
-  "spec/features/communities_spec.rb": 1.7133822441101074,
-  "spec/features/admin/moderators_spec.rb": 1.2922589778900146,
-  "spec/helpers/geozones_helper_spec.rb": 0.09812736511230469,
-  "spec/features/welcome_spec.rb": 1.5019774436950684,
-  "spec/controllers/comments_controller_spec.rb": 0.36508607864379883,
-  "spec/features/admin/legislation/questions_spec.rb": 3.81538724899292,
-  "spec/controllers/users/registrations_controller_spec.rb": 0.018311023712158203,
-  "spec/features/comments/debates_spec.rb": 12.265411615371704,
-  "spec/features/users_spec.rb": 11.05901050567627,
-  "spec/models/budget/group_spec.rb": 0.04957008361816406,
-  "spec/features/admin/poll/questions_spec.rb": 1.9041199684143066,
-  "spec/helpers/admin_helper_spec.rb": 0.00651097297668457,
-  "spec/models/abilities/organization_spec.rb": 0.24821996688842773,
-  "spec/features/moderation/comments_spec.rb": 6.318082332611084,
-  "spec/features/admin/poll/polls_spec.rb": 8.88325023651123,
-  "spec/models/activity_spec.rb": 0.9704892635345459,
-  "spec/features/verification/level_two_verification_spec.rb": 0.421832799911499,
-  "spec/models/poll/officer_assignment_spec.rb": 0.029267072677612305,
-  "spec/features/admin/verifications_spec.rb": 0.507885217666626,
-  "spec/mailers/mailer_spec.rb": 0.07406282424926758,
-  "spec/models/legislation/draft_version_spec.rb": 0.025011777877807617,
-  "spec/models/budget/investment_spec.rb": 9.084597826004028,
-  "spec/features/proposals_spec.rb": 183.71455550193787,
-  "spec/features/tags_spec.rb": 2.949070453643799,
-  "spec/features/tags/debates_spec.rb": 4.345250368118286,
-  "spec/features/admin/geozones_spec.rb": 1.935765027999878,
-  "spec/features/admin/feature_flags_spec.rb": 0.8357558250427246,
-  "spec/models/user_spec.rb": 2.436626434326172,
-  "spec/features/moderation/debates_spec.rb": 6.05112886428833,
-  "spec/models/legislation/annotation_spec.rb": 0.21427702903747559,
-  "spec/features/comments/proposals_spec.rb": 32.52879500389099,
-  "spec/controllers/legislation/answers_controller_spec.rb": 0.3481717109680176,
-  "spec/features/verification/sms_spec.rb": 1.2817349433898926,
-  "spec/features/admin/budget_investments_spec.rb": 16.1332266330719,
-  "spec/features/notifications_spec.rb": 14.857182264328003,
-  "spec/lib/tag_sanitizer_spec.rb": 0.0005936622619628906,
-  "spec/controllers/admin/api/stats_controller_spec.rb": 0.3948392868041992,
-  "spec/features/comments/topics_spec.rb": 29.646622896194458,
-  "spec/models/debate_spec.rb": 5.2278876304626465,
-  "spec/lib/email_digests_spec.rb": 0.6660604476928711,
-  "spec/models/abilities/everyone_spec.rb": 0.06328749656677246,
-  "spec/features/direct_messages_spec.rb": 1.3006987571716309,
-  "spec/features/debates_spec.rb": 28.736626386642456,
-  "spec/models/setting_spec.rb": 0.07938265800476074,
-  "spec/models/legislation/question_option_spec.rb": 0.058206796646118164,
-  "spec/models/verification/management/document_spec.rb": 0.013574600219726562,
-  "spec/models/poll/booth_spec.rb": 0.07824325561523438,
-  "spec/features/admin/legislation/draft_versions_spec.rb": 3.750009059906006,
-  "spec/features/admin/poll/officers_spec.rb": 1.4151291847229004,
-  "spec/features/moderation_spec.rb": 1.9578778743743896,
-  "spec/features/legislation/questions_spec.rb": 1.7689197063446045,
-  "spec/features/officing/residence_spec.rb": 0.971078634262085,
-  "spec/models/follow_spec.rb": 0.12199592590332031,
-  "spec/lib/census_api_spec.rb": 0.0019702911376953125,
-  "spec/models/tag_cloud_spec.rb": 1.5725350379943848,
-  "spec/models/budget_spec.rb": 0.2335052490234375,
-  "spec/features/management/localization_spec.rb": 1.1911811828613281,
-  "spec/features/legislation/draft_versions_spec.rb": 8.151643514633179,
-  "spec/models/budget/heading_spec.rb": 0.09901237487792969,
-  "spec/models/poll/poll_spec.rb": 0.46999382972717285,
-  "spec/models/custom/residence_spec.rb": 0.050164222717285156,
-  "spec/models/notification_spec.rb": 0.39408183097839355,
-  "spec/features/budgets/ballots_spec.rb": 27.406018257141113,
-  "spec/mailers/devise_mailer_spec.rb": 0.16486406326293945,
-  "spec/features/admin/debates_spec.rb": 1.546919345855713,
-  "spec/features/valuation/budgets_spec.rb": 0.2552778720855713,
-  "spec/models/abilities/common_spec.rb": 6.724466562271118,
-  "spec/models/residence_spec.rb": 0.24986696243286133,
-  "spec/features/officing/voters_spec.rb": 2.954087257385254,
-  "spec/models/vote_spec.rb": 1.3241477012634277,
-  "spec/lib/migrate_spending_proposals_to_investments_spec.rb": 1.1774518489837646,
-  "spec/controllers/management/users_controller_spec.rb": 0.007733821868896484,
-  "spec/helpers/proposals_helper_spec.rb": 0.21885180473327637,
-  "spec/features/ckeditor_spec.rb": 0.7726309299468994,
-  "spec/lib/census_caller_spec.rb": 0.009332895278930664,
-  "spec/features/tracks_spec.rb": 2.7082908153533936,
-  "spec/features/admin/budgets_spec.rb": 4.468225002288818,
-  "spec/features/admin/valuators_spec.rb": 1.3326430320739746,
-  "spec/features/admin/banners_spec.rb": 3.302579164505005,
-  "spec/features/account_spec.rb": 2.30243182182312,
-  "spec/features/budgets/budgets_spec.rb": 1.0318260192871094,
-  "spec/models/poll/answer_spec.rb": 0.11362218856811523,
-  "spec/features/comments/budget_investments_spec.rb": 16.92409658432007,
-  "spec/features/budgets/results_spec.rb": 2.589841365814209,
-  "spec/features/valuation_spec.rb": 2.126727819442749,
-  "spec/features/stats_spec.rb": 0.8516559600830078,
-  "spec/features/admin/poll/booths_spec.rb": 1.766916275024414,
-  "spec/models/legislation/process/phase_spec.rb": 0.0886683464050293,
-  "spec/models/budget/investment/milestone_spec.rb": 0.1419520378112793,
-  "spec/models/letter_spec.rb": 0.08197903633117676,
-  "spec/features/admin/stats_spec.rb": 3.6946730613708496,
-  "spec/models/identity_spec.rb": 0.004762887954711914,
-  "spec/features/verification/letter_spec.rb": 1.7480952739715576,
-  "spec/models/topic_spec.rb": 0.30414509773254395,
-  "spec/features/users_auth_spec.rb": 7.242254257202148,
-  "spec/lib/acts_as_taggable_on_spec.rb": 0.7477433681488037,
-  "spec/features/official_positions_spec.rb": 1.9427640438079834,
-  "spec/features/admin/newsletters_spec.rb": 0.22768402099609375,
-  "spec/features/admin/hidden_users_spec.rb": 1.4156956672668457,
-  "spec/features/comments/legislation_annotations_spec.rb": 18.616747856140137,
-  "spec/features/admin/site_customization/pages_spec.rb": 1.0219447612762451,
-  "spec/models/poll/shift_spec.rb": 0.2051677703857422,
-  "spec/models/geozone_spec.rb": 0.12972474098205566,
-  "spec/helpers/verification_helper_spec.rb": 0.0009250640869140625,
-  "spec/lib/cache_spec.rb": 0.06447911262512207,
-  "spec/features/verification/verification_path_spec.rb": 1.2300751209259033,
-  "spec/features/sessions_spec.rb": 0.3665180206298828,
-  "spec/controllers/management/base_controller_spec.rb": 0.019928932189941406,
-  "spec/features/verification/verified_user_spec.rb": 0.787623405456543,
-  "spec/models/direct_message_spec.rb": 0.49156641960144043,
-  "spec/features/admin/tags_spec.rb": 1.045637845993042,
-  "spec/features/admin/comments_spec.rb": 3.4312756061553955,
-  "spec/features/moderation/users_spec.rb": 1.1841027736663818,
-  "spec/models/budget/reclassified_vote_spec.rb": 0.22663235664367676,
-  "spec/features/admin/organizations_spec.rb": 3.4465878009796143,
-  "spec/features/proposal_notifications_spec.rb": 4.40612268447876,
-  "spec/features/emails_spec.rb": 13.047018051147461,
-  "spec/controllers/debates_controller_spec.rb": 0.3078582286834717,
-  "spec/features/budgets/investments_spec.rb": 126.55784440040588,
-  "spec/features/verification/residence_spec.rb": 1.8894774913787842,
-  "spec/models/abilities/moderator_spec.rb": 2.7029502391815186,
-  "spec/helpers/votes_helper_spec.rb": 0.363523006439209,
-  "spec/features/tags/proposals_spec.rb": 8.272820949554443,
-  "spec/models/signature_spec.rb": 1.6858570575714111,
-  "spec/models/legislation/process/publication_spec.rb": 0.0707387924194336,
-  "spec/models/community_spec.rb": 0.13965797424316406,
-  "spec/models/sms_spec.rb": 0.024147987365722656,
-  "spec/lib/graphql_spec.rb": 3.7293970584869385,
-  "spec/lib/tasks/communities_spec.rb": 0.17484474182128906,
-  "spec/features/management/proposals_spec.rb": 4.549585580825806,
-  "spec/models/document_spec.rb": 1.2667145729064941,
-  "spec/features/site_customization/content_blocks_spec.rb": 0.3020951747894287,
-  "spec/features/localization_spec.rb": 0.5679850578308105,
-  "spec/models/signature_sheet_spec.rb": 0.7970001697540283,
-  "spec/features/budgets/votes_spec.rb": 4.38911509513855,
-  "spec/features/verification/level_three_verification_spec.rb": 1.2754230499267578,
-  "spec/features/admin/users_spec.rb": 0.3584918975830078,
-  "spec/models/abilities/valuator_spec.rb": 1.1300320625305176,
-  "spec/models/officing/residence_spec.rb": 0.3599817752838135,
-  "spec/features/admin/officials_spec.rb": 0.940401554107666,
-  "spec/features/admin/settings_spec.rb": 0.37268495559692383,
-  "spec/models/ahoy/data_source_spec.rb": 0.04887723922729492,
-  "spec/helpers/settings_helper_spec.rb": 0.020088911056518555,
-  "spec/models/budget/result_spec.rb": 0.7962813377380371,
-  "spec/models/poll/null_result_spec.rb": 0.17995309829711914,
-  "spec/models/valuator_spec.rb": 0.02411341667175293,
-  "spec/lib/manager_authenticator_spec.rb": 0.0031435489654541016,
-  "spec/lib/tasks/settings_spec.rb": 0.07562613487243652,
-  "spec/controllers/legislation/annotations_controller_spec.rb": 0.712010383605957,
-  "spec/models/comment_spec.rb": 1.7274408340454102,
-  "spec/features/comments/legislation_questions_spec.rb": 15.219935894012451,
-  "spec/features/admin_spec.rb": 1.1390578746795654,
-  "spec/features/admin/poll/booth_assigments_spec.rb": 3.737426280975342,
-  "spec/controllers/pages_controller_spec.rb": 0.3043200969696045,
-  "spec/features/admin/administrators_spec.rb": 2.7916433811187744,
-  "spec/models/poll/total_result_spec.rb": 0.549537181854248,
-  "spec/features/management/managed_users_spec.rb": 4.38576078414917,
-  "spec/models/poll/officer_spec.rb": 0.49225711822509766,
-  "spec/features/user_invites_spec.rb": 0.21891093254089355,
-  "spec/helpers/application_helper_spec.rb": 0.13661718368530273,
-  "spec/features/management/account_spec.rb": 0.9717822074890137,
-  "spec/features/management/document_verifications_spec.rb": 1.0395607948303223,
-  "spec/features/admin/site_customization/images_spec.rb": 1.2623581886291504,
-  "spec/models/organization_spec.rb": 0.16587495803833008,
-  "spec/features/management/email_verifications_spec.rb": 0.46370506286621094,
-  "spec/features/legislation/processes_spec.rb": 3.2473270893096924,
-  "spec/features/admin/managers_spec.rb": 1.1836414337158203,
-  "spec/models/legislation/question_spec.rb": 0.4404168128967285,
-  "spec/features/management/budget_investments_spec.rb": 7.179029703140259,
-  "spec/features/admin/signature_sheets_spec.rb": 1.4004056453704834,
-  "spec/features/admin/poll/shifts_spec.rb": 2.6800806522369385,
-  "spec/i18n_spec.rb": 58.107173204422,
-  "spec/features/site_customization/custom_pages_spec.rb": 0.454498291015625,
-  "spec/features/admin/legislation/processes_spec.rb": 3.3492519855499268,
-  "spec/features/votes_spec.rb": 16.538654088974,
-  "spec/features/admin/budget_investment_milestones_spec.rb": 1.3747622966766357,
-  "spec/models/poll/white_result_spec.rb": 0.23045921325683594,
-  "spec/controllers/management/sessions_controller_spec.rb": 0.06758952140808105,
-  "spec/features/management/users_spec.rb": 2.044326066970825,
-  "spec/controllers/concerns/has_filters_spec.rb": 0.275907039642334,
-  "spec/features/moderation/proposals_spec.rb": 5.00596022605896,
-  "spec/lib/wysiwyg_sanitizer_spec.rb": 0.0016448497772216797,
-  "spec/models/budget/ballot_spec.rb": 0.6595156192779541,
-  "spec/models/poll/voter_spec.rb": 0.2982313632965088,
-  "spec/features/valuation/budget_investments_spec.rb": 6.490516185760498
+  "spec/models/setting_spec.rb": 0.07869887351989746,
+  "spec/features/admin/managers_spec.rb": 5.029380798339844,
+  "spec/features/management/managed_users_spec.rb": 3.1642160415649414,
+  "spec/features/admin/poll/booths_spec.rb": 1.4152588844299316,
+  "spec/features/admin/comments_spec.rb": 3.889301061630249,
+  "spec/helpers/admin_helper_spec.rb": 0.005057334899902344,
+  "spec/models/abilities/moderator_spec.rb": 2.3274271488189697,
+  "spec/controllers/admin/api/stats_controller_spec.rb": 0.4249396324157715,
+  "spec/features/admin/organizations_spec.rb": 3.339292049407959,
+  "spec/features/admin/newsletters_spec.rb": 0.2460641860961914,
+  "spec/helpers/geozones_helper_spec.rb": 0.08249163627624512,
+  "spec/lib/graph_ql/api_types_creator_spec.rb": 0.006573915481567383,
+  "spec/features/emails_spec.rb": 18.91256046295166,
+  "spec/features/admin/hidden_users_spec.rb": 1.3854436874389648,
+  "spec/features/welcome_spec.rb": 1.1956276893615723,
+  "spec/features/sessions_spec.rb": 0.3943772315979004,
+  "spec/models/custom/residence_spec.rb": 0.07002687454223633,
+  "spec/models/poll/booth_spec.rb": 0.05489993095397949,
+  "spec/models/direct_message_spec.rb": 0.3973381519317627,
+  "spec/features/valuation/budget_investments_spec.rb": 7.6013023853302,
+  "spec/models/map_location_spec.rb": 0.12476563453674316,
+  "spec/models/budget/heading_spec.rb": 0.09248590469360352,
+  "spec/models/user_spec.rb": 2.9006423950195312,
+  "spec/features/admin/site_customization/content_blocks_spec.rb": 1.6733989715576172,
+  "spec/mailers/mailer_spec.rb": 0.08513784408569336,
+  "spec/models/site_customization/page_spec.rb": 0.015056133270263672,
+  "spec/features/management/budget_investments_spec.rb": 8.112786293029785,
+  "spec/features/admin/activity_spec.rb": 12.442089080810547,
+  "spec/features/registration_form_spec.rb": 1.0509357452392578,
+  "spec/controllers/legislation/annotations_controller_spec.rb": 0.8151364326477051,
+  "spec/lib/census_caller_spec.rb": 0.018165111541748047,
+  "spec/features/users_auth_spec.rb": 6.5102221965789795,
+  "spec/features/tags/proposals_spec.rb": 10.001718521118164,
+  "spec/features/account_spec.rb": 2.2510504722595215,
+  "spec/features/admin/users_spec.rb": 0.4342050552368164,
+  "spec/lib/cache_spec.rb": 0.057682037353515625,
+  "spec/features/valuation_spec.rb": 1.3436784744262695,
+  "spec/models/budget/investment_spec.rb": 12.89230751991272,
+  "spec/lib/migrate_spending_proposals_to_investments_spec.rb": 0.904367208480835,
+  "spec/helpers/settings_helper_spec.rb": 0.02300858497619629,
+  "spec/helpers/application_helper_spec.rb": 0.09152626991271973,
+  "spec/models/legislation/draft_version_spec.rb": 0.020322084426879883,
+  "spec/models/legislation/question_spec.rb": 0.3402721881866455,
+  "spec/models/document_spec.rb": 1.3238348960876465,
+  "spec/models/poll/question_spec.rb": 0.12588191032409668,
+  "spec/features/admin/poll/polls_spec.rb": 11.77881646156311,
+  "spec/lib/manager_authenticator_spec.rb": 0.006296873092651367,
+  "spec/features/admin/debates_spec.rb": 1.688420295715332,
+  "spec/features/moderation/debates_spec.rb": 5.343512773513794,
+  "spec/controllers/debates_controller_spec.rb": 0.40573883056640625,
+  "spec/models/tag_cloud_spec.rb": 1.6984672546386719,
+  "spec/models/budget/investment/milestone_spec.rb": 0.15051603317260742,
+  "spec/models/proposal_notification_spec.rb": 0.2914905548095703,
+  "spec/features/budgets/investments_spec.rb": 93.5263159275055,
+  "spec/i18n_spec.rb": 96.26275777816772,
+  "spec/models/community_spec.rb": 0.16270899772644043,
+  "spec/controllers/graphql_controller_spec.rb": 0.5831413269042969,
+  "spec/models/legislation/annotation_spec.rb": 0.16232728958129883,
+  "spec/lib/acts_as_taggable_on_spec.rb": 0.5747356414794922,
+  "spec/lib/census_api_spec.rb": 0.0021581649780273438,
+  "spec/features/moderation/comments_spec.rb": 6.70704984664917,
+  "spec/models/poll/voter_spec.rb": 0.32018303871154785,
+  "spec/features/proposal_notifications_spec.rb": 3.906450033187866,
+  "spec/models/budget/result_spec.rb": 0.8468267917633057,
+  "spec/helpers/users_helper_spec.rb": 0.25751638412475586,
+  "spec/features/valuation/budgets_spec.rb": 0.2564871311187744,
+  "spec/controllers/users/registrations_controller_spec.rb": 0.022383689880371094,
+  "spec/controllers/management/base_controller_spec.rb": 0.06711888313293457,
+  "spec/features/admin/officials_spec.rb": 0.893528938293457,
+  "spec/features/comments/topics_spec.rb": 29.998314142227173,
+  "spec/features/users_spec.rb": 11.885858297348022,
+  "spec/models/topic_spec.rb": 0.27634167671203613,
+  "spec/models/follow_spec.rb": 0.1256728172302246,
+  "spec/lib/local_census_spec.rb": 0.005529880523681641,
+  "spec/features/verification/sms_spec.rb": 1.5214743614196777,
+  "spec/helpers/comments_helper_spec.rb": 0.010879278182983398,
+  "spec/models/valuator_spec.rb": 0.02650904655456543,
+  "spec/features/proposal_ballots_spec.rb": 0.3937220573425293,
+  "spec/features/proposals_spec.rb": 142.48229122161865,
+  "spec/features/legislation/processes_spec.rb": 2.863476514816284,
+  "spec/features/ckeditor_spec.rb": 0.8433480262756348,
+  "spec/models/letter_spec.rb": 0.0695810317993164,
+  "spec/features/admin/budget_investments_spec.rb": 18.484699964523315,
+  "spec/models/officing/residence_spec.rb": 0.3402073383331299,
+  "spec/controllers/concerns/has_orders_spec.rb": 0.1844041347503662,
+  "spec/features/admin/legislation/processes_spec.rb": 4.020649433135986,
+  "spec/features/management/users_spec.rb": 2.288966178894043,
+  "spec/lib/tasks/communities_spec.rb": 0.15353775024414062,
+  "spec/models/abilities/organization_spec.rb": 0.24793481826782227,
+  "spec/features/polls/polls_spec.rb": 2.591568946838379,
+  "spec/features/communities_spec.rb": 1.6137127876281738,
+  "spec/models/legislation/process/phase_spec.rb": 0.07121586799621582,
+  "spec/features/officing_spec.rb": 0.979363203048706,
+  "spec/features/site_customization/custom_pages_spec.rb": 0.5588700771331787,
+  "spec/features/comments/legislation_questions_spec.rb": 14.133169889450073,
+  "spec/features/organizations_spec.rb": 0.46280837059020996,
+  "spec/controllers/legislation/answers_controller_spec.rb": 0.39082813262939453,
+  "spec/models/image_spec.rb": 7.636544466018677,
+  "spec/features/management/account_spec.rb": 1.150636911392212,
+  "spec/models/abilities/common_spec.rb": 5.959435701370239,
+  "spec/features/comments/debates_spec.rb": 13.69457721710205,
+  "spec/models/poll/shift_spec.rb": 0.19109749794006348,
+  "spec/features/site_customization/content_blocks_spec.rb": 0.3058288097381592,
+  "spec/models/poll/recount_spec.rb": 0.1983809471130371,
+  "spec/features/verification/level_two_verification_spec.rb": 0.4596068859100342,
+  "spec/features/verification/level_three_verification_spec.rb": 1.456559658050537,
+  "spec/lib/tasks/settings_spec.rb": 0.04654407501220703,
+  "spec/features/admin/budget_investment_milestones_spec.rb": 1.3974273204803467,
+  "spec/features/management/localization_spec.rb": 1.1653187274932861,
+  "spec/features/admin/tags_spec.rb": 1.0751111507415771,
+  "spec/features/officing/results_spec.rb": 1.2672057151794434,
+  "spec/features/admin/poll/booth_assigments_spec.rb": 4.1742753982543945,
+  "spec/models/poll/officer_assignment_spec.rb": 0.024514198303222656,
+  "spec/controllers/management/sessions_controller_spec.rb": 0.07244610786437988,
+  "spec/features/admin/signature_sheets_spec.rb": 1.4268932342529297,
+  "spec/models/debate_spec.rb": 4.550540924072266,
+  "spec/features/comments/proposals_spec.rb": 25.726442337036133,
+  "spec/models/poll/partial_result_spec.rb": 0.32181620597839355,
+  "spec/features/admin/legislation/draft_versions_spec.rb": 3.4613990783691406,
+  "spec/models/budget_spec.rb": 0.14807415008544922,
+  "spec/models/sms_spec.rb": 0.018825769424438477,
+  "spec/features/admin/proposals_spec.rb": 1.837270975112915,
+  "spec/models/geozone_spec.rb": 0.11852264404296875,
+  "spec/features/admin/banners_spec.rb": 3.0584604740142822,
+  "spec/models/legislation/process/publication_spec.rb": 0.06270265579223633,
+  "spec/lib/graph_ql/query_type_creator_spec.rb": 0.009456157684326172,
+  "spec/features/moderation_spec.rb": 1.001516342163086,
+  "spec/features/campaigns_spec.rb": 0.8359789848327637,
+  "spec/features/admin/verifications_spec.rb": 0.6421175003051758,
+  "spec/features/localization_spec.rb": 0.756089448928833,
+  "spec/features/admin/poll/questions_spec.rb": 41.59848093986511,
+  "spec/features/tags/debates_spec.rb": 3.4022486209869385,
+  "spec/helpers/text_helper_spec.rb": 0.0006229877471923828,
+  "spec/features/admin/moderators_spec.rb": 1.3467354774475098,
+  "spec/models/flag_spec.rb": 0.5202171802520752,
+  "spec/mailers/devise_mailer_spec.rb": 0.2588930130004883,
+  "spec/features/user_invites_spec.rb": 0.18819189071655273,
+  "spec/features/legislation/draft_versions_spec.rb": 9.352471828460693,
+  "spec/features/home_spec.rb": 3.0868682861328125,
+  "spec/features/budgets/results_spec.rb": 2.4918482303619385,
+  "spec/features/budgets/votes_spec.rb": 4.285862922668457,
+  "spec/features/comments/budget_investments_spec.rb": 16.1397545337677,
+  "spec/features/admin/stats_spec.rb": 2.678718090057373,
+  "spec/features/polls/questions_spec.rb": 2.594414472579956,
+  "spec/features/admin/poll/shifts_spec.rb": 4.629284143447876,
+  "spec/helpers/votes_helper_spec.rb": 0.31733107566833496,
+  "spec/models/ahoy/data_source_spec.rb": 0.04695439338684082,
+  "spec/models/residence_spec.rb": 0.20260858535766602,
+  "spec/features/admin_spec.rb": 0.6963987350463867,
+  "spec/controllers/comments_controller_spec.rb": 0.2683417797088623,
+  "spec/lib/age_spec.rb": 0.0007379055023193359,
+  "spec/models/legislation/answer_spec.rb": 0.14532899856567383,
+  "spec/features/tags_spec.rb": 3.0131027698516846,
+  "spec/features/admin/valuators_spec.rb": 1.0099408626556396,
+  "spec/models/notification_spec.rb": 0.37938618659973145,
+  "spec/views/welcome/index.html.erb_spec.rb": 0.1471250057220459,
+  "spec/customization_engine_spec.rb": 1.5587348937988281,
+  "spec/models/poll/officer_spec.rb": 0.2980079650878906,
+  "spec/features/budgets/ballots_spec.rb": 25.24861741065979,
+  "spec/controllers/concerns/has_filters_spec.rb": 0.1412961483001709,
+  "spec/features/moderation/proposals_spec.rb": 5.947849273681641,
+  "spec/features/management/document_verifications_spec.rb": 0.9574480056762695,
+  "spec/features/legislation/questions_spec.rb": 1.605849027633667,
+  "spec/models/proposal_spec.rb": 5.872406482696533,
+  "spec/models/legislation/question_option_spec.rb": 0.0395960807800293,
+  "spec/features/budgets/budgets_spec.rb": 0.8722023963928223,
+  "spec/lib/email_digests_spec.rb": 0.440814733505249,
+  "spec/features/official_positions_spec.rb": 1.5717194080352783,
+  "spec/features/officing/residence_spec.rb": 0.9819045066833496,
+  "spec/features/officing/voters_spec.rb": 2.078903913497925,
+  "spec/features/direct_messages_spec.rb": 1.6070659160614014,
+  "spec/models/abilities/everyone_spec.rb": 0.059804677963256836,
+  "spec/lib/acts_as_paranoid_aliases_spec.rb": 0.33096909523010254,
+  "spec/features/debates_spec.rb": 32.84718298912048,
+  "spec/features/votes_spec.rb": 18.217467069625854,
+  "spec/models/activity_spec.rb": 1.0154414176940918,
+  "spec/controllers/pages_controller_spec.rb": 0.19468045234680176,
+  "spec/features/admin/feature_flags_spec.rb": 0.726452112197876,
+  "spec/models/signature_sheet_spec.rb": 0.6403882503509521,
+  "spec/features/admin/poll/officers_spec.rb": 1.2912020683288574,
+  "spec/models/lock_spec.rb": 0.08562397956848145,
+  "spec/helpers/proposals_helper_spec.rb": 0.17275524139404297,
+  "spec/features/tags/budget_investments_spec.rb": 14.154245615005493,
+  "spec/models/vote_spec.rb": 0.9258472919464111,
+  "spec/features/admin/site_customization/pages_spec.rb": 1.0365827083587646,
+  "spec/features/moderation/users_spec.rb": 1.3000907897949219,
+  "spec/features/comments/legislation_annotations_spec.rb": 19.67066717147827,
+  "spec/features/admin/legislation/questions_spec.rb": 4.043334007263184,
+  "spec/models/comment_spec.rb": 1.6633994579315186,
+  "spec/features/admin/site_customization/images_spec.rb": 1.2299704551696777,
+  "spec/models/abilities/valuator_spec.rb": 1.1985805034637451,
+  "spec/models/organization_spec.rb": 0.12121891975402832,
+  "spec/models/budget/ballot_spec.rb": 0.6403298377990723,
+  "spec/lib/wysiwyg_sanitizer_spec.rb": 0.0018651485443115234,
+  "spec/features/stats_spec.rb": 0.8169982433319092,
+  "spec/models/poll/answer_spec.rb": 0.13266730308532715,
+  "spec/features/admin/settings_spec.rb": 3.1228368282318115,
+  "spec/features/verification/verification_path_spec.rb": 1.1146795749664307,
+  "spec/controllers/management/users_controller_spec.rb": 0.004178762435913086,
+  "spec/models/direct_upload_spec.rb": 1.1311051845550537,
+  "spec/features/management/email_verifications_spec.rb": 0.3727388381958008,
+  "spec/models/abilities/administrator_spec.rb": 2.355985164642334,
+  "spec/models/budget/ballot/line_spec.rb": 0.49976515769958496,
+  "spec/features/verification/letter_spec.rb": 1.5464122295379639,
+  "spec/features/notifications_spec.rb": 19.54401397705078,
+  "spec/features/admin/administrators_spec.rb": 1.7901337146759033,
+  "spec/models/signature_spec.rb": 1.5397937297821045,
+  "spec/models/identity_spec.rb": 0.0023458003997802734,
+  "spec/models/verification/management/document_spec.rb": 0.017922163009643555,
+  "spec/models/legislation/process_spec.rb": 0.09648776054382324,
+  "spec/models/budget/group_spec.rb": 0.049637794494628906,
+  "spec/models/verification/management/email_spec.rb": 0.057023048400878906,
+  "spec/helpers/verification_helper_spec.rb": 0.0009088516235351562,
+  "spec/features/verification/residence_spec.rb": 2.2246382236480713,
+  "spec/features/tracks_spec.rb": 2.320988178253174,
+  "spec/lib/tag_sanitizer_spec.rb": 0.0005729198455810547,
+  "spec/features/admin/budgets_spec.rb": 4.4486541748046875,
+  "spec/models/site_customization/content_block_spec.rb": 0.010473012924194336,
+  "spec/features/verification/email_spec.rb": 0.5266687870025635,
+  "spec/models/budget/reclassified_vote_spec.rb": 0.19786882400512695,
+  "spec/features/management/proposals_spec.rb": 4.107697486877441,
+  "spec/models/poll/poll_spec.rb": 0.38217735290527344,
+  "spec/features/admin/geozones_spec.rb": 1.561723232269287,
+  "spec/lib/graphql_spec.rb": 3.063258647918701,
+  "spec/features/verification/verified_user_spec.rb": 0.8179008960723877
 }
\ No newline at end of file
diff --git a/spec/factories.rb b/spec/factories.rb
index 69aa92c62..f7b10bba1 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -489,6 +489,11 @@ FactoryGirl.define do
       ends_at { 15.days.ago }
     end
 
+    trait :recounting do
+      starts_at { 1.month.ago }
+      ends_at { Date.current }
+    end
+
     trait :published do
       published true
     end
@@ -507,6 +512,12 @@ FactoryGirl.define do
     sequence(:description) { |n| "Answer description #{n}" }
   end
 
+  factory :poll_answer_video, class: 'Poll::Question::Answer::Video' do
+    association :answer, factory: :poll_question_answer
+    title "Sample video title"
+    url "https://youtu.be/nhuNb0XtRhQ"
+  end
+
   factory :poll_booth, class: 'Poll::Booth' do
     sequence(:name) { |n| "Booth #{n}" }
     sequence(:location) { |n| "Street #{n}" }
@@ -531,6 +542,14 @@ FactoryGirl.define do
     association :booth, factory: :poll_booth
     association :officer, factory: :poll_officer
     date Date.current
+
+    trait :vote_collection_task do
+      task 0
+    end
+
+    trait :recount_scrutiny_task do
+      task 1
+    end
   end
 
   factory :poll_voter, class: 'Poll::Voter' do
@@ -567,21 +586,6 @@ FactoryGirl.define do
     answer { question.valid_answers.sample }
   end
 
-  factory :poll_white_result, class: 'Poll::WhiteResult' do
-    association :author, factory: :user
-    origin { 'web' }
-  end
-
-  factory :poll_null_result, class: 'Poll::NullResult' do
-    association :author, factory: :user
-    origin { 'web' }
-  end
-
-  factory :poll_total_result, class: 'Poll::TotalResult' do
-    association :author, factory: :user
-    origin { 'web' }
-  end
-
   factory :poll_recount, class: 'Poll::Recount' do
     association :author, factory: :user
     origin { 'web' }
diff --git a/spec/features/admin/poll/booths_spec.rb b/spec/features/admin/poll/booths_spec.rb
index 4eeb81cb6..1aa487b26 100644
--- a/spec/features/admin/poll/booths_spec.rb
+++ b/spec/features/admin/poll/booths_spec.rb
@@ -113,4 +113,18 @@ feature 'Admin booths' do
     end
   end
 
+  scenario "Back link go back to available list when manage shifts" do
+    poll = create(:poll, :current)
+    booth = create(:poll_booth)
+    assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
+
+    visit available_admin_booths_path
+
+    within("#booth_#{booth.id}") do
+      click_link "Manage shifts"
+    end
+
+    click_link "Go back"
+    expect(current_path).to eq(available_admin_booths_path)
+  end
 end
diff --git a/spec/features/admin/poll/officer_assignments_spec.rb b/spec/features/admin/poll/officer_assignments_spec.rb
new file mode 100644
index 000000000..48d10ad39
--- /dev/null
+++ b/spec/features/admin/poll/officer_assignments_spec.rb
@@ -0,0 +1,67 @@
+require 'rails_helper'
+
+feature 'Officer Assignments' do
+
+  background do
+    admin = create(:administrator)
+    login_as(admin.user)
+  end
+
+  scenario "Index" do
+    poll = create(:poll)
+    booth = create(:poll_booth)
+
+    officer1 = create(:poll_officer)
+    officer2 = create(:poll_officer)
+    officer3 = create(:poll_officer)
+
+    booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
+    officer_assignment = create(:poll_officer_assignment, booth_assignment: booth_assignment, officer: officer1)
+
+    booth_assignment_2 = create(:poll_booth_assignment, poll: poll)
+    officer_assignment_2 = create(:poll_officer_assignment, booth_assignment: booth_assignment_2, officer: officer2)
+
+    visit admin_poll_path(poll)
+
+    click_link 'Officers (2)'
+
+    within('#officer_assignments') do
+      expect(page).to have_content officer1.name
+      expect(page).to have_content officer2.name
+      expect(page).to_not have_content officer3.name
+    end
+  end
+
+  scenario "Search", :js do
+    poll = create(:poll)
+    booth = create(:poll_booth)
+
+    user1 = create(:user, username: "John Snow")
+    user2 = create(:user, username: "John Silver")
+    user3 = create(:user, username: "John Edwards")
+
+    officer1 = create(:poll_officer, user: user1)
+    officer2 = create(:poll_officer, user: user2)
+    officer3 = create(:poll_officer, user: user3)
+
+    booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
+    officer_assignment = create(:poll_officer_assignment, booth_assignment: booth_assignment, officer: officer1)
+
+    booth_assignment_2 = create(:poll_booth_assignment, poll: poll)
+    officer_assignment_2 = create(:poll_officer_assignment, booth_assignment: booth_assignment_2, officer: officer2)
+
+    visit admin_poll_path(poll)
+
+    click_link 'Officers (2)'
+
+    fill_in "search-officers", with: "John"
+    click_button "Search"
+
+    within('#search-officers-results') do
+      expect(page).to have_content officer1.name
+      expect(page).to have_content officer2.name
+      expect(page).to_not have_content officer3.name
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/spec/features/admin/poll/shifts_spec.rb b/spec/features/admin/poll/shifts_spec.rb
index 2ac290216..bddd1b6b1 100644
--- a/spec/features/admin/poll/shifts_spec.rb
+++ b/spec/features/admin/poll/shifts_spec.rb
@@ -35,9 +35,10 @@ feature 'Admin shifts' do
     create(:poll, :incoming)
     poll = create(:poll, :current)
     booth = create(:poll_booth)
-    assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
+    create(:poll_booth_assignment, poll: poll, booth: booth)
+    create(:poll_booth_assignment, poll: create(:poll, :expired), booth: booth)
     officer = create(:poll_officer)
-    vote_collection_dates = (poll.starts_at.to_date..poll.ends_at.to_date).to_a.map { |date| I18n.l(date, format: :long) }
+    vote_collection_dates = (Date.current..poll.ends_at.to_date).to_a.map { |date| I18n.l(date, format: :long) }
     recount_scrutiny_dates = (poll.ends_at.to_date..poll.ends_at.to_date + 1.week).to_a.map { |date| I18n.l(date, format: :long) }
 
     visit available_admin_booths_path
@@ -52,14 +53,14 @@ feature 'Admin shifts' do
 
     expect(page).to have_select('shift_date_vote_collection_date', options: ["Select day", *vote_collection_dates])
     expect(page).not_to have_select('shift_date_recount_scrutiny_date')
-    select I18n.l(poll.starts_at.to_date, format: :long), from: 'shift_date_vote_collection_date'
+    select I18n.l(Date.current, format: :long), from: 'shift_date_vote_collection_date'
     click_button "Add shift"
 
     expect(page).to have_content "Shift added"
 
     within("#shifts") do
       expect(page).to have_css(".shift", count: 1)
-      expect(page).to have_content(I18n.l(poll.starts_at.to_date, format: :long))
+      expect(page).to have_content(I18n.l(Date.current, format: :long))
       expect(page).to have_content("Collect Votes")
       expect(page).to have_content(officer.name)
     end
@@ -91,6 +92,37 @@ feature 'Admin shifts' do
     end
   end
 
+  scenario "Vote Collection Shift and Recount & Scrutiny Shift don't include already assigned dates to officer", :js do
+    poll = create(:poll, :current)
+    booth = create(:poll_booth)
+    assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
+    officer = create(:poll_officer)
+
+    shift1 = create(:poll_shift, :vote_collection_task, officer: officer, booth: booth, date: Time.zone.today)
+    shift2 = create(:poll_shift, :recount_scrutiny_task, officer: officer, booth: booth, date: Time.zone.tomorrow)
+
+    vote_collection_dates = (Date.current..poll.ends_at.to_date).to_a
+                                                                .reject { |date| date == Time.zone.today }
+                                                                .map { |date| I18n.l(date, format: :long) }
+    recount_scrutiny_dates = (poll.ends_at.to_date..poll.ends_at.to_date + 1.week).to_a
+                                                                                  .reject { |date| date == Time.zone.tomorrow }
+                                                                                  .map { |date| I18n.l(date, format: :long) }
+
+    visit available_admin_booths_path
+
+    within("#booth_#{booth.id}") do
+      click_link "Manage shifts"
+    end
+
+    fill_in "search", with: officer.email
+    click_button "Search"
+    click_link "Edit shifts"
+
+    expect(page).to have_select('shift_date_vote_collection_date', options: ["Select day", *vote_collection_dates])
+    select "Recount & Scrutiny", from: 'shift_task'
+    expect(page).to have_select('shift_date_recount_scrutiny_date', options: ["Select day", *recount_scrutiny_dates])
+  end
+
   scenario "Error on create", :js do
     poll = create(:poll, :current)
     booth = create(:poll_booth)
diff --git a/spec/features/admin/settings_spec.rb b/spec/features/admin/settings_spec.rb
index 73d190cb9..40baf6423 100644
--- a/spec/features/admin/settings_spec.rb
+++ b/spec/features/admin/settings_spec.rb
@@ -87,7 +87,6 @@ feature 'Admin settings' do
       expect(page).to have_content "Map configuration updated succesfully"
     end
 
-
   end
 
 end
diff --git a/spec/features/admin/tags_spec.rb b/spec/features/admin/tags_spec.rb
index dd9c38c6b..8ff205852 100644
--- a/spec/features/admin/tags_spec.rb
+++ b/spec/features/admin/tags_spec.rb
@@ -23,7 +23,7 @@ feature 'Admin tags' do
 
     within("form.new_tag") do
       fill_in "tag_name", with: 'important issues'
-      click_button 'Create Topic'
+      click_button 'Create topic'
     end
 
     visit admin_tags_path
@@ -39,8 +39,8 @@ feature 'Admin tags' do
     expect(page).to have_content @tag1.name
     expect(page).to have_content tag2.name
 
-    within("#edit_tag_#{tag2.id}") do
-      click_link 'Destroy Topic'
+    within("#tag_#{tag2.id}") do
+      click_link 'Destroy topic'
     end
 
     visit admin_tags_path
@@ -58,8 +58,8 @@ feature 'Admin tags' do
     expect(page).to have_content @tag1.name
     expect(page).to have_content tag2.name
 
-    within("#edit_tag_#{tag2.id}") do
-      click_link 'Destroy Topic'
+    within("#tag_#{tag2.id}") do
+      click_link 'Destroy topic'
     end
 
     visit admin_tags_path
@@ -81,7 +81,7 @@ feature 'Admin tags' do
 
       within("form.new_tag") do
         fill_in "tag_name", with: "wow_category"
-        click_button 'Create Topic'
+        click_button 'Create topic'
       end
 
       expect(ActsAsTaggableOn::Tag.category.where(name: "wow_category")).to exist
diff --git a/spec/features/comments/polls_spec.rb b/spec/features/comments/polls_spec.rb
index 8ef528cd3..0fe01cf06 100644
--- a/spec/features/comments/polls_spec.rb
+++ b/spec/features/comments/polls_spec.rb
@@ -21,7 +21,7 @@ feature 'Commenting polls' do
   end
 
   scenario 'Show' do
-  	skip "Feature not implemented yet, review soon"
+    skip "Feature not implemented yet, review soon"
 
     parent_comment = create(:comment, commentable: poll)
     first_child    = create(:comment, commentable: poll, parent: parent_comment)
@@ -243,7 +243,7 @@ feature 'Commenting polls' do
   end
 
   scenario "Flagging as inappropriate", :js do
-  	skip "Feature not implemented yet, review soon"
+    skip "Feature not implemented yet, review soon"
 
     comment = create(:comment, commentable: poll)
 
@@ -261,7 +261,7 @@ feature 'Commenting polls' do
   end
 
   scenario "Undoing flagging as inappropriate", :js do
-  	skip "Feature not implemented yet, review soon"
+    skip "Feature not implemented yet, review soon"
 
     comment = create(:comment, commentable: poll)
     Flag.flag(user, comment)
@@ -280,7 +280,7 @@ feature 'Commenting polls' do
   end
 
   scenario "Flagging turbolinks sanity check", :js do
-  	skip "Feature not implemented yet, review soon"
+    skip "Feature not implemented yet, review soon"
 
     poll = create(:poll, title: "Should we change the world?")
     comment = create(:comment, commentable: poll)
@@ -310,7 +310,7 @@ feature 'Commenting polls' do
   feature "Moderators" do
 
     scenario "can create comment as a moderator", :js do
-    	skip "Feature not implemented yet, review soon"
+      skip "Feature not implemented yet, review soon"
 
       moderator = create(:moderator)
 
@@ -330,7 +330,7 @@ feature 'Commenting polls' do
     end
 
     scenario "can create reply as a moderator", :js do
-    	skip "Feature not implemented yet, review soon"
+      skip "Feature not implemented yet, review soon"
 
       citizen = create(:user, username: "Ana")
       manuela = create(:user, username: "Manuela")
@@ -359,7 +359,7 @@ feature 'Commenting polls' do
     end
 
     scenario "can not comment as an administrator" do
-    	skip "Feature not implemented yet, review soon"
+      skip "Feature not implemented yet, review soon"
 
       moderator = create(:moderator)
 
@@ -372,7 +372,7 @@ feature 'Commenting polls' do
 
   feature "Administrators" do
     scenario "can create comment as an administrator", :js do
-    	skip "Feature not implemented yet, review soon"
+      skip "Feature not implemented yet, review soon"
 
       admin = create(:administrator)
 
@@ -392,7 +392,7 @@ feature 'Commenting polls' do
     end
 
     scenario "can create reply as an administrator", :js do
-    	skip "Feature not implemented yet, review soon"
+      skip "Feature not implemented yet, review soon"
 
       citizen = create(:user, username: "Ana")
       manuela = create(:user, username: "Manuela")
@@ -421,7 +421,7 @@ feature 'Commenting polls' do
     end
 
     scenario "can not comment as a moderator" do
-    	skip "Feature not implemented yet, review soon"
+      skip "Feature not implemented yet, review soon"
 
       admin = create(:administrator)
 
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index 3d7c6acf8..39cd84760 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -394,7 +394,7 @@ feature 'Debates' do
       end
 
       scenario 'Debates are ordered by recommendations when there is a user logged', :js do
-        proposal = create(:proposal, tag_list: "Sport" )
+        proposal = create(:proposal, tag_list: "Sport")
         user = create(:user)
         create(:follow, followable: proposal, user: user)
         login_as(user)
@@ -830,7 +830,7 @@ feature 'Debates' do
       debate2 = create(:debate, title: "Show what you got", cached_votes_total: 1,   tag_list: "Sport")
       debate3 = create(:debate, title: "Do not display with same tag", cached_votes_total: 100, tag_list: "Sport")
       debate4 = create(:debate, title: "Do not display",    cached_votes_total: 1)
-      proposal1 =  create(:proposal, tag_list: "Sport")
+      proposal1 = create(:proposal, tag_list: "Sport")
       create(:follow, followable: proposal1, user: user)
 
       visit debates_path
diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb
index a26e8ce11..74b608ed6 100644
--- a/spec/features/emails_spec.rb
+++ b/spec/features/emails_spec.rb
@@ -408,7 +408,6 @@ feature 'Emails' do
       end
       expect(page).to have_content 'It will be done next week.'
 
-
       email = open_last_email
       expect(email).to have_subject('Someone has responded to your comment')
       expect(email).to deliver_to(user1)
diff --git a/spec/features/home_spec.rb b/spec/features/home_spec.rb
index cb5349814..4854fff4d 100644
--- a/spec/features/home_spec.rb
+++ b/spec/features/home_spec.rb
@@ -27,7 +27,7 @@ feature "Home" do
       background do
         Setting['feature.user.recommendations'] = true
         user = create(:user)
-        proposal = create(:proposal, tag_list: "Sport" )
+        proposal = create(:proposal, tag_list: "Sport")
         create(:follow, followable: proposal, user: user)
         login_as(user)
       end
diff --git a/spec/features/officing_spec.rb b/spec/features/officing_spec.rb
index aff3eac4e..2a54bbff1 100644
--- a/spec/features/officing_spec.rb
+++ b/spec/features/officing_spec.rb
@@ -1,4 +1,5 @@
 require 'rails_helper'
+require 'sessions_helper'
 
 feature 'Poll Officing' do
   let(:user) { create(:user) }
@@ -106,4 +107,47 @@ feature 'Poll Officing' do
     expect(page).to_not have_css('#moderation_menu')
   end
 
-end
\ No newline at end of file
+  scenario 'Officing dashboard available for multiple sessions' do
+    poll = create(:poll)
+    booth = create(:poll_booth)
+    booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
+
+    user1 = create(:user)
+    user2 = create(:user)
+    officer1 = create(:poll_officer, user: user1)
+    officer2 = create(:poll_officer, user: user2)
+
+    officer_assignment_1 = create(:poll_officer_assignment, booth_assignment: booth_assignment, officer: officer1)
+    officer_assignment_2 = create(:poll_officer_assignment, booth_assignment: booth_assignment, officer: officer2)
+
+    in_browser(:one) do
+      login_as user1
+      visit officing_root_path
+    end
+
+    in_browser(:two) do
+      login_as user2
+      visit officing_root_path
+    end
+
+    in_browser(:one) do
+      page.should have_content("Here you can validate user documents and store voting results")
+
+      visit new_officing_residence_path
+      page.should have_content("Validate document")
+
+      visit final_officing_polls_path
+      page.should have_content("Polls ready for final recounting")
+    end
+
+    in_browser(:two) do
+      page.should have_content("Here you can validate user documents and store voting results")
+
+      visit new_officing_residence_path
+      page.should have_content("Validate document")
+
+      visit final_officing_polls_path
+      page.should have_content("Polls ready for final recounting")
+    end
+  end
+end
diff --git a/spec/features/polls/answers_spec.rb b/spec/features/polls/answers_spec.rb
index 32b5732a0..8bb87c94e 100644
--- a/spec/features/polls/answers_spec.rb
+++ b/spec/features/polls/answers_spec.rb
@@ -2,20 +2,20 @@ require 'rails_helper'
 
 feature 'Answers' do
 
+  let(:question) { create(:poll_question) }
+  let(:admin) { create(:administrator) }
+
   background do
-    admin = create(:administrator)
     login_as(admin.user)
   end
 
   scenario "Index" do
-    question = create(:poll_question)
     answer1 = create(:poll_question_answer, question: question, given_order: 2)
     answer2 = create(:poll_question_answer, question: question, given_order: 1)
 
     visit admin_question_path(question)
 
     expect(page).to have_css(".poll_question_answer", count: 2)
-
     expect(page.body.index(answer1.title)).to be < page.body.index(answer2.title)
 
     within("#poll_question_answer_#{answer1.id}") do
@@ -25,8 +25,6 @@ feature 'Answers' do
   end
 
   scenario "Create" do
-    question = create(:poll_question)
-
     visit admin_question_path(question)
 
     click_link "Add answer"
@@ -35,12 +33,34 @@ feature 'Answers' do
     click_button "Save"
 
     expect(page).to have_content "Answer created successfully"
-
     expect(page).to have_css(".poll_question_answer", count: 1)
     expect(page).to have_content "¿Would you like to reform Central Park?"
     expect(page).to have_content "Adding more trees, creating a play area..."
   end
 
+  scenario 'Add video to answer' do
+    answer1 = create(:poll_question_answer, question: question)
+    answer2 = create(:poll_question_answer, question: question)
+
+    visit admin_question_path(question)
+
+    within("#poll_question_answer_#{answer1.id}") do
+      click_link "Video list"
+    end
+
+    click_link "Add video"
+
+    fill_in "poll_question_answer_video_title", with: "Awesome project video"
+    fill_in "poll_question_answer_video_url", with: "https://www.youtube.com/watch?v=123"
+
+    click_button "Save"
+
+    within("#poll_question_answer_video_#{answer1.videos.last.id}") do
+      expect(page).to have_content "Awesome project video"
+      expect(page).to have_content "https://www.youtube.com/watch?v=123"
+    end
+  end
+
   pending "Update"
   pending "Destroy"
 
diff --git a/spec/features/polls/polls_spec.rb b/spec/features/polls/polls_spec.rb
index 223aa9e9d..7bf51473f 100644
--- a/spec/features/polls/polls_spec.rb
+++ b/spec/features/polls/polls_spec.rb
@@ -65,6 +65,16 @@ feature 'Polls' do
     let(:geozone) { create(:geozone) }
     let(:poll) { create(:poll, summary: "Summary", description: "Description") }
 
+    scenario 'Show answers with videos' do
+      question = create(:poll_question, poll: poll)
+      answer = create(:poll_question_answer, question: question, title: 'Chewbacca')
+      video = create(:poll_answer_video, answer: answer, title: "Awesome project video", url: "https://www.youtube.com/watch?v=123")
+
+      visit poll_path(poll)
+
+      expect(page).to have_link("Awesome project video", href: "https://www.youtube.com/watch?v=123")
+    end
+
     scenario 'Lists questions from proposals as well as regular ones' do
       normal_question = create(:poll_question, poll: poll)
       proposal_question = create(:poll_question, poll: poll, proposal: create(:proposal))
diff --git a/spec/features/polls/voter_spec.rb b/spec/features/polls/voter_spec.rb
index 334696768..ff9b71755 100644
--- a/spec/features/polls/voter_spec.rb
+++ b/spec/features/polls/voter_spec.rb
@@ -41,6 +41,27 @@ feature "Voter" do
       expect(Poll::Voter.first.origin).to eq("web")
     end
 
+    scenario "Voting via web as unverified user", :js do
+      poll = create(:poll)
+
+      question = create(:poll_question, poll: poll)
+      answer1 = create(:poll_question_answer, question: question, title: 'Yes')
+      answer2 = create(:poll_question_answer, question: question, title: 'No')
+
+      user = create(:user, :incomplete_verification)
+
+      login_as user
+      visit poll_path(poll)
+
+      within("#poll_question_#{question.id}_answers") do
+        expect(page).to_not have_link('Yes', href: "/questions/#{question.id}/answer?answer=Yes&token=")
+        expect(page).to_not have_link('No', href: "/questions/#{question.id}/answer?answer=No&token=")
+      end
+
+      expect(page).to have_content("You must verify your account in order to answer")
+      expect(page).to_not have_content("You have already participated in this poll. If you vote again it will be overwritten")
+    end
+
     scenario "Voting in booth", :js do
       user = create(:user, :in_census)
 
@@ -126,10 +147,36 @@ feature "Voter" do
           expect(page).to have_link('Yes')
           expect(page).to have_link('No')
         end
-
       end
     end
 
+    scenario "Voting in poll and then verifiying account", :js do
+      user = create(:user)
+
+      question = create(:poll_question, poll: poll)
+      answer1 = create(:poll_question_answer, question: question, title: 'Yes')
+      answer2 = create(:poll_question_answer, question: question, title: 'No')
+
+      login_through_form_as_officer(officer.user)
+      vote_for_poll_via_booth
+
+      visit root_path
+      click_link "Sign out"
+
+      login_as user
+      visit account_path
+      click_link 'Verify my account'
+
+      verify_residence
+      confirm_phone(user)
+
+      visit poll_path(poll)
+
+      expect(page).to_not have_link('Yes')
+      expect(page).to have_content "You have already participated in a physical booth. You can not participate again."
+      expect(Poll::Voter.count).to eq(1)
+    end
+
   end
 
 end
diff --git a/spec/models/debate_spec.rb b/spec/models/debate_spec.rb
index 64dbf729f..3e1278bd7 100644
--- a/spec/models/debate_spec.rb
+++ b/spec/models/debate_spec.rb
@@ -725,10 +725,10 @@ describe Debate do
     end
 
     it "Should return debates ordered by cached_votes_total" do
-      debate1 =  create(:debate, cached_votes_total: 1, tag_list: "Sport" )
-      debate2 =  create(:debate, cached_votes_total: 5, tag_list: "Sport" )
-      debate3 =  create(:debate, cached_votes_total: 10, tag_list: "Sport" )
-      proposal = create(:proposal, tag_list: "Sport" )
+      debate1 =  create(:debate, cached_votes_total: 1, tag_list: "Sport")
+      debate2 =  create(:debate, cached_votes_total: 5, tag_list: "Sport")
+      debate3 =  create(:debate, cached_votes_total: 10, tag_list: "Sport")
+      proposal = create(:proposal, tag_list: "Sport")
       create(:follow, followable: proposal, user: user)
 
       result = Debate.recommendations(user).sort_by_recommendations
@@ -741,7 +741,7 @@ describe Debate do
     it "Should return debates related with user interests" do
       debate1 =  create(:debate, tag_list: "Sport")
       debate2 =  create(:debate, tag_list: "Politics")
-      proposal1 =  create(:proposal, tag_list: "Sport")
+      proposal1 = create(:proposal, tag_list: "Sport")
       create(:follow, followable: proposal1, user: user)
 
       result = Debate.recommendations(user)
@@ -753,7 +753,7 @@ describe Debate do
     it "Should not return debates when user is the author" do
       debate1 =  create(:debate, author: user, tag_list: "Sport")
       debate2 =  create(:debate, tag_list: "Sport")
-      proposal = create(:proposal, tag_list: "Sport" )
+      proposal = create(:proposal, tag_list: "Sport")
       create(:follow, followable: proposal, user: user)
 
       result = Debate.recommendations(user)
diff --git a/spec/models/direct_upload_spec.rb b/spec/models/direct_upload_spec.rb
index 5abe06765..8cfebf076 100644
--- a/spec/models/direct_upload_spec.rb
+++ b/spec/models/direct_upload_spec.rb
@@ -42,7 +42,7 @@ describe DirectUpload do
 
       proposal_document_direct_upload.save_attachment
 
-      expect(File.exists?(proposal_document_direct_upload.relation.attachment.path)).to eq(true)
+      expect(File.exist?(proposal_document_direct_upload.relation.attachment.path)).to eq(true)
       expect(proposal_document_direct_upload.relation.attachment.path).to include('cached_attachments')
     end
 
@@ -57,7 +57,7 @@ describe DirectUpload do
       uploaded_path = proposal_document_direct_upload.relation.attachment.path
       proposal_document_direct_upload.destroy_attachment
 
-      expect(File.exists?(uploaded_path)).to eq(false)
+      expect(File.exist?(uploaded_path)).to eq(false)
     end
 
   end
diff --git a/spec/models/map_location_spec.rb b/spec/models/map_location_spec.rb
index bd093a71e..62070529e 100644
--- a/spec/models/map_location_spec.rb
+++ b/spec/models/map_location_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe MapLocation do
 
-  let(:map_location) { build(:map_location, :proposal_map_location ) }
+  let(:map_location) { build(:map_location, :proposal_map_location) }
 
   it "should be valid" do
     expect(map_location).to be_valid
diff --git a/spec/models/poll/null_result_spec.rb b/spec/models/poll/null_result_spec.rb
deleted file mode 100644
index 746b48377..000000000
--- a/spec/models/poll/null_result_spec.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-require 'rails_helper'
-
-describe Poll::NullResult do
-
-  describe "logging changes" do
-    it "should update amount_log if amount changes" do
-      null_result = create(:poll_null_result, amount: 33)
-
-      expect(null_result.amount_log).to eq("")
-
-      null_result.amount = 33
-      null_result.save
-      null_result.amount = 32
-      null_result.save
-      null_result.amount = 34
-      null_result.save
-
-      expect(null_result.amount_log).to eq(":33:32")
-    end
-
-    it "should update officer_assignment_id_log if amount changes" do
-      null_result = create(:poll_null_result, amount: 33)
-
-      expect(null_result.amount_log).to eq("")
-      expect(null_result.officer_assignment_id_log).to eq("")
-
-      null_result.amount = 33
-      null_result.officer_assignment = create(:poll_officer_assignment, id: 101)
-      null_result.save
-
-      null_result.amount = 32
-      null_result.officer_assignment = create(:poll_officer_assignment, id: 102)
-      null_result.save
-
-      null_result.amount = 34
-      null_result.officer_assignment = create(:poll_officer_assignment, id: 103)
-      null_result.save
-
-      expect(null_result.amount_log).to eq(":33:32")
-      expect(null_result.officer_assignment_id_log).to eq(":101:102")
-    end
-
-    it "should update author_id if amount changes" do
-      null_result = create(:poll_null_result, amount: 33)
-
-      expect(null_result.amount_log).to eq("")
-      expect(null_result.author_id_log).to eq("")
-
-      author_A = create(:poll_officer).user
-      author_B = create(:poll_officer).user
-      author_C = create(:poll_officer).user
-
-      null_result.amount = 33
-      null_result.author_id = author_A.id
-      null_result.save!
-
-      null_result.amount = 32
-      null_result.author_id = author_B.id
-      null_result.save!
-
-      null_result.amount = 34
-      null_result.author_id = author_C.id
-      null_result.save!
-
-      expect(null_result.amount_log).to eq(":33:32")
-      expect(null_result.author_id_log).to eq(":#{author_A.id}:#{author_B.id}")
-    end
-  end
-
-end
\ No newline at end of file
diff --git a/spec/models/poll/partial_result_spec.rb b/spec/models/poll/partial_result_spec.rb
index dd6176a06..07e6a7355 100644
--- a/spec/models/poll/partial_result_spec.rb
+++ b/spec/models/poll/partial_result_spec.rb
@@ -57,24 +57,24 @@ describe Poll::PartialResult do
       expect(partial_result.amount_log).to eq("")
       expect(partial_result.author_id_log).to eq("")
 
-      author_A = create(:poll_officer).user
-      author_B = create(:poll_officer).user
-      author_C = create(:poll_officer).user
+      author1 = create(:poll_officer).user
+      author2 = create(:poll_officer).user
+      author3 = create(:poll_officer).user
 
       partial_result.amount = 33
-      partial_result.author_id = author_A.id
+      partial_result.author_id = author1.id
       partial_result.save!
 
       partial_result.amount = 32
-      partial_result.author_id = author_B.id
+      partial_result.author_id = author2.id
       partial_result.save!
 
       partial_result.amount = 34
-      partial_result.author_id = author_C.id
+      partial_result.author_id = author3.id
       partial_result.save!
 
       expect(partial_result.amount_log).to eq(":33:32")
-      expect(partial_result.author_id_log).to eq(":#{author_A.id}:#{author_B.id}")
+      expect(partial_result.author_id_log).to eq(":#{author1.id}:#{author2.id}")
     end
   end
 
diff --git a/spec/models/poll/poll_spec.rb b/spec/models/poll/poll_spec.rb
index 5083d7439..bfb5881f2 100644
--- a/spec/models/poll/poll_spec.rb
+++ b/spec/models/poll/poll_spec.rb
@@ -76,6 +76,38 @@ describe :poll do
     end
   end
 
+  describe "#recounting" do
+    it "returns polls in recount & scrutiny phase" do
+      current = create(:poll, :current)
+      incoming = create(:poll, :incoming)
+      expired = create(:poll, :expired)
+      recounting = create(:poll, :recounting)
+
+      recounting_polls = Poll.recounting
+
+      expect(recounting_polls).to_not include(current)
+      expect(recounting_polls).to_not include(incoming)
+      expect(recounting_polls).to_not include(expired)
+      expect(recounting_polls).to include(recounting)
+    end
+  end
+
+  describe "#current_or_recounting_or_incoming" do
+    it "returns current or recounting or incoming polls" do
+      current = create(:poll, :current)
+      incoming = create(:poll, :incoming)
+      expired = create(:poll, :expired)
+      recounting = create(:poll, :recounting)
+
+      current_or_recounting_or_incoming = Poll.current_or_recounting_or_incoming
+
+      expect(current_or_recounting_or_incoming).to include(current)
+      expect(current_or_recounting_or_incoming).to include(recounting)
+      expect(current_or_recounting_or_incoming).to include(incoming)
+      expect(current_or_recounting_or_incoming).to_not include(expired)
+    end
+  end
+
   describe "answerable_by" do
     let(:geozone) {create(:geozone) }
 
diff --git a/spec/models/poll/total_result_spec.rb b/spec/models/poll/total_result_spec.rb
deleted file mode 100644
index baa877227..000000000
--- a/spec/models/poll/total_result_spec.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-require 'rails_helper'
-
-describe Poll::TotalResult do
-
-  describe "logging changes" do
-    it "should update amount_log if amount changes" do
-      total_result = create(:poll_total_result, amount: 33)
-
-      expect(total_result.amount_log).to eq("")
-
-      total_result.amount = 33
-      total_result.save
-      total_result.amount = 32
-      total_result.save
-      total_result.amount = 34
-      total_result.save
-
-      expect(total_result.amount_log).to eq(":33:32")
-    end
-
-    it "should update officer_assignment_id_log if amount changes" do
-      total_result = create(:poll_total_result, amount: 33)
-
-      expect(total_result.amount_log).to eq("")
-      expect(total_result.officer_assignment_id_log).to eq("")
-
-      total_result.amount = 33
-      total_result.officer_assignment = create(:poll_officer_assignment, id: 101)
-      total_result.save
-
-      total_result.amount = 32
-      total_result.officer_assignment = create(:poll_officer_assignment, id: 102)
-      total_result.save
-
-      total_result.amount = 34
-      total_result.officer_assignment = create(:poll_officer_assignment, id: 103)
-      total_result.save
-
-      expect(total_result.amount_log).to eq(":33:32")
-      expect(total_result.officer_assignment_id_log).to eq(":101:102")
-    end
-
-    it "should update author_id if amount changes" do
-      total_result = create(:poll_total_result, amount: 33)
-
-      expect(total_result.amount_log).to eq("")
-      expect(total_result.author_id_log).to eq("")
-
-      author_A = create(:poll_officer).user
-      author_B = create(:poll_officer).user
-      author_C = create(:poll_officer).user
-
-      total_result.amount = 33
-      total_result.author_id = author_A.id
-      total_result.save!
-
-      total_result.amount = 32
-      total_result.author_id = author_B.id
-      total_result.save!
-
-      total_result.amount = 34
-      total_result.author_id = author_C.id
-      total_result.save!
-
-      expect(total_result.amount_log).to eq(":33:32")
-      expect(total_result.author_id_log).to eq(":#{author_A.id}:#{author_B.id}")
-    end
-  end
-
-end
diff --git a/spec/models/poll/white_result_spec.rb b/spec/models/poll/white_result_spec.rb
deleted file mode 100644
index 687c4ebe1..000000000
--- a/spec/models/poll/white_result_spec.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-require 'rails_helper'
-
-describe Poll::WhiteResult do
-
-  describe "logging changes" do
-    it "should update amount_log if amount changes" do
-      white_result = create(:poll_white_result, amount: 33)
-
-      expect(white_result.amount_log).to eq("")
-
-      white_result.amount = 33
-      white_result.save
-      white_result.amount = 32
-      white_result.save
-      white_result.amount = 34
-      white_result.save
-
-      expect(white_result.amount_log).to eq(":33:32")
-    end
-
-    it "should update officer_assignment_id_log if amount changes" do
-      white_result = create(:poll_white_result, amount: 33)
-
-      expect(white_result.amount_log).to eq("")
-      expect(white_result.officer_assignment_id_log).to eq("")
-
-      white_result.amount = 33
-      white_result.officer_assignment = create(:poll_officer_assignment, id: 21)
-      white_result.save
-
-      white_result.amount = 32
-      white_result.officer_assignment = create(:poll_officer_assignment, id: 22)
-      white_result.save
-
-      white_result.amount = 34
-      white_result.officer_assignment = create(:poll_officer_assignment, id: 23)
-      white_result.save
-
-      expect(white_result.amount_log).to eq(":33:32")
-      expect(white_result.officer_assignment_id_log).to eq(":21:22")
-    end
-
-    it "should update author_id if amount changes" do
-      white_result = create(:poll_white_result, amount: 33)
-
-      expect(white_result.amount_log).to eq("")
-      expect(white_result.author_id_log).to eq("")
-
-      author_A = create(:poll_officer).user
-      author_B = create(:poll_officer).user
-      author_C = create(:poll_officer).user
-
-      white_result.amount = 33
-      white_result.author_id = author_A.id
-      white_result.save!
-
-      white_result.amount = 32
-      white_result.author_id = author_B.id
-      white_result.save!
-
-      white_result.amount = 34
-      white_result.author_id = author_C.id
-      white_result.save!
-
-      expect(white_result.amount_log).to eq(":33:32")
-      expect(white_result.author_id_log).to eq(":#{author_A.id}:#{author_B.id}")
-    end
-  end
-
-end
\ No newline at end of file
diff --git a/spec/models/proposal_spec.rb b/spec/models/proposal_spec.rb
index 588bd4057..29338a62f 100644
--- a/spec/models/proposal_spec.rb
+++ b/spec/models/proposal_spec.rb
@@ -903,10 +903,10 @@ describe Proposal do
     end
 
     it "Should return proposals ordered by cached_votes_up" do
-      proposal1 = create(:proposal, cached_votes_up: 1,  tag_list: "Sport" )
-      proposal2 = create(:proposal, cached_votes_up: 5,  tag_list: "Sport" )
-      proposal3 = create(:proposal, cached_votes_up: 10, tag_list: "Sport" )
-      proposal4 = create(:proposal, tag_list: "Sport" )
+      proposal1 = create(:proposal, cached_votes_up: 1,  tag_list: "Sport")
+      proposal2 = create(:proposal, cached_votes_up: 5,  tag_list: "Sport")
+      proposal3 = create(:proposal, cached_votes_up: 10, tag_list: "Sport")
+      proposal4 = create(:proposal, tag_list: "Sport")
       create(:follow, followable: proposal4, user: user)
 
       result = Proposal.recommendations(user).sort_by_recommendations
diff --git a/spec/sessions_helper.rb b/spec/sessions_helper.rb
new file mode 100644
index 000000000..fc3fcc2f0
--- /dev/null
+++ b/spec/sessions_helper.rb
@@ -0,0 +1,8 @@
+def in_browser(name)
+  old_session = Capybara.session_name
+
+  Capybara.session_name = name
+  yield
+
+  Capybara.session_name = old_session
+end
diff --git a/spec/shared/features/mappable.rb b/spec/shared/features/mappable.rb
index ccbcd5625..65ece1f25 100644
--- a/spec/shared/features/mappable.rb
+++ b/spec/shared/features/mappable.rb
@@ -2,7 +2,7 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name,
 
   include ActionView::Helpers
 
-  let!(:user)         { create(:user, :level_two) }
+  let!(:user) { create(:user, :level_two) }
 
   before do
     Setting['feature.map'] = true
@@ -11,7 +11,7 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name,
   describe "At #{mappable_new_path}" do
 
     let!(:arguments)    { {} }
-    let!(:mappable)     { create("#{mappable_factory_name}".to_sym) }
+    let!(:mappable)     { create(mappable_factory_name.to_s.to_sym) }
     let!(:map_location) { create(:map_location, "#{mappable_factory_name}_map_location".to_sym, "#{mappable_association_name}": mappable) }
 
     before { set_arguments(arguments, mappable, mappable_path_arguments) }
@@ -77,10 +77,10 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name,
 
   describe "At #{mappable_edit_path}" do
 
-    let!(:mappable)     { create("#{mappable_factory_name}".to_sym) }
+    let!(:mappable)     { create(mappable_factory_name.to_s.to_sym) }
     let!(:map_location) { create(:map_location, "#{mappable_factory_name}_map_location".to_sym, "#{mappable_association_name}": mappable) }
 
-    before { skip } unless mappable_edit_path.present?
+    before { skip } if mappable_edit_path.blank?
 
     scenario "Should edit map on #{mappable_factory_name} and contain default values", :js do
       login_as mappable.author
@@ -143,13 +143,13 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name,
   describe "At #{mappable_show_path}" do
 
     let!(:arguments)    { {} }
-    let!(:mappable)     { create("#{mappable_factory_name}".to_sym) }
+    let!(:mappable)     { create(mappable_factory_name.to_s.to_sym) }
     let!(:map_location) { create(:map_location, "#{mappable_factory_name}_map_location".to_sym, "#{mappable_association_name}": mappable) }
 
     before { set_arguments(arguments, mappable, mappable_path_arguments) }
 
     scenario "Should display map on #{mappable_factory_name} show page", :js do
-      arguments.merge!("id": mappable.id)
+      arguments[:id] = mappable.id
 
       visit send(mappable_show_path, arguments)
 
@@ -157,9 +157,9 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name,
     end
 
     scenario "Should not display map on #{mappable_factory_name} show when marker is not defined", :js do
-      mappable_without_map = create("#{mappable_factory_name}".to_sym)
+      mappable_without_map = create(mappable_factory_name.to_s.to_sym)
       set_arguments(arguments, mappable_without_map, mappable_path_arguments)
-      arguments.merge!("id": mappable_without_map.id)
+      arguments[:id] = mappable_without_map.id
 
       visit send(mappable_show_path, arguments)
 
@@ -168,7 +168,7 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name,
 
     scenario "Should not display map on #{mappable_factory_name} show page when feature.map is disable", :js do
       Setting['feature.map'] = false
-      arguments.merge!("id": mappable.id)
+      arguments[:id] = mappable.id
 
       visit send(mappable_show_path, arguments)
 
@@ -212,9 +212,7 @@ def submit_budget_investment_form
 end
 
 def set_arguments(arguments, mappable, mappable_path_arguments)
-  if mappable_path_arguments
-    mappable_path_arguments.each do |argument_name, path_to_value|
+  mappable_path_arguments&.each do |argument_name, path_to_value|
       arguments.merge!("#{argument_name}": mappable.send(path_to_value))
-    end
   end
 end
diff --git a/spec/shared/features/nested_documentable.rb b/spec/shared/features/nested_documentable.rb
index 24d6631a8..3661af408 100644
--- a/spec/shared/features/nested_documentable.rb
+++ b/spec/shared/features/nested_documentable.rb
@@ -199,8 +199,8 @@ shared_examples "nested documentable" do |login_as_name, documentable_factory_na
       find("#tab-documents-label").click
       expect(page).to have_content "empty.pdf"
 
-      #Review
-      #Doble check why the file is stored with a name different to empty.pdf
+      # Review
+      # Doble check why the file is stored with a name different to empty.pdf
       expect(page).to have_css("a[href$='.pdf']")
     end
 
diff --git a/spec/shared/features/nested_imageable.rb b/spec/shared/features/nested_imageable.rb
index 1eef9a269..947887afa 100644
--- a/spec/shared/features/nested_imageable.rb
+++ b/spec/shared/features/nested_imageable.rb
@@ -1,4 +1,4 @@
-shared_examples "nested imageable" do |imageable_factory_name, path, imageable_path_arguments, fill_resource_method_name, submit_button, imageable_success_notice, has_many_images=false|
+shared_examples "nested imageable" do |imageable_factory_name, path, imageable_path_arguments, fill_resource_method_name, submit_button, imageable_success_notice, has_many_images = false|
   include ActionView::Helpers
   include ImagesHelper
   include ImageablesHelper
@@ -9,15 +9,11 @@ shared_examples "nested imageable" do |imageable_factory_name, path, imageable_p
   let!(:imageable)           { create(imageable_factory_name) }
 
   before do
-    if imageable_path_arguments
-      imageable_path_arguments.each do |argument_name, path_to_value|
+    imageable_path_arguments&.each do |argument_name, path_to_value|
         arguments.merge!("#{argument_name}": imageable.send(path_to_value))
-      end
     end
 
-    if imageable.respond_to?(:author)
-      imageable.update(author: user)
-    end
+    imageable.update(author: user) if imageable.respond_to?(:author)
   end
 
   describe "at #{path}" do
@@ -119,7 +115,7 @@ shared_examples "nested imageable" do |imageable_factory_name, path, imageable_p
       click_on submit_button
 
       if has_many_images
-        #Pending. Review soon and test
+        # Pending. Review soon and test
       else
         within "#nested-image .image" do
           expect(page).to have_content("can't be blank", count: 2)
@@ -174,7 +170,7 @@ shared_examples "nested imageable" do |imageable_factory_name, path, imageable_p
       imageable_redirected_to_resource_show_or_navigate_to
 
       if has_many_images
-        #Pending. Review soon and test
+        # Pending. Review soon and test
       else
         expect(page).to have_selector "figure img"
         expect(page).to have_selector "figure figcaption"
@@ -230,7 +226,7 @@ rescue
   return
 end
 
-def imageable_attach_new_file(imageable_factory_name, path, success = true)
+def imageable_attach_new_file(_imageable_factory_name, path, success = true)
   click_link "Add image"
   within "#nested-image" do
     image = find(".image")
diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb
index 256b070e4..b87a54d8e 100644
--- a/spec/support/common_actions.rb
+++ b/spec/support/common_actions.rb
@@ -163,14 +163,15 @@ module CommonActions
     expect(page).to have_content 'Document verified with Census'
   end
 
-  def confirm_phone
+  def confirm_phone(user = nil)
+    user ||= User.last
+
     fill_in 'sms_phone', with: "611111111"
     click_button 'Send'
 
     expect(page).to have_content 'Enter the confirmation code sent to you by text message'
 
-    user = User.last.reload
-    fill_in 'sms_confirmation_code', with: user.sms_confirmation_code
+    fill_in 'sms_confirmation_code', with: user.reload.sms_confirmation_code
     click_button 'Send'
 
     expect(page).to have_content 'Code correct'