diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
index 0689cbc01..abb23cf0a 100644
--- a/.github/PULL_REQUEST_TEMPLATE
+++ b/.github/PULL_REQUEST_TEMPLATE
@@ -1,17 +1,17 @@
 References
-==========
+===================
 > Add references to related Issues/Pull Requests/Travis Builds/Rollbar errors/etc...
 
 Objectives
-==========
+===================
 > What are the objectives of this changes? (If there is no related Issue with an explanation)
 
-Visual Changes (if any)
-=======================
+Visual Changes
+===================
 > Any visual changes? please attach screenshots (or gifs) showing them.
 > If modified views are public (not the admin panel), try them in mobile display (with your browser's developer console) and add screenshots.
 
 Notes
-=====================
+===================
 > Mention rake tasks or actions to be done when deploying this changes to a server (if any).
 > Explain any caveats, or important things to notice like deprecations (if any).
diff --git a/Dockerfile b/Dockerfile
index 40e32c768..880d17e43 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,17 @@
-# # Select ubuntu as the base image
-FROM coreapps/ruby2.3
+FROM ruby:2.3.6
 
 # Install essential Linux packages
-RUN apt-get update -qq && apt-get install -y build-essential libpq-dev postgresql-client nodejs imagemagick
+RUN apt-get update -qq && apt-get install -y build-essential libpq-dev postgresql-client nodejs imagemagick sudo
+
+# Files created inside the container repect the ownership
+RUN adduser --shell /bin/bash --disabled-password --gecos "" consul \
+  && adduser consul sudo \
+  && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+RUN echo 'Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/bundle/bin"' > /etc/sudoers.d/secure_path
+RUN chmod 0440 /etc/sudoers.d/secure_path
+
+COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
 
 # Define where our application will live inside the image
 ENV RAILS_ROOT /var/www/consul
diff --git a/Gemfile b/Gemfile
index f7f9c46ad..be4ee12f1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,7 @@ gem 'acts-as-taggable-on', '~> 5.0.0'
 gem 'acts_as_votable', '~> 0.11.1'
 gem 'ahoy_matey', '~> 1.6.0'
 gem 'ancestry', '~> 3.0.1'
+gem 'autoprefixer-rails', '~> 8.2.0'
 gem 'browser', '~> 2.5.2'
 gem 'cancancan', '~> 2.1.2'
 gem 'ckeditor', '~> 4.2.3'
@@ -17,7 +18,7 @@ gem 'delayed_job_active_record', '~> 4.1.0'
 gem 'devise', '~> 3.5.7'
 gem 'devise-async', '~> 0.10.2'
 gem 'devise_security_extension', '~> 0.10.0'
-gem 'foundation-rails', '~> 6.2.4.0'
+gem 'foundation-rails', '~> 6.4.3.0'
 gem 'foundation_rails_helper', '~> 2.0.0'
 gem 'graphiql-rails', '~> 1.4.1'
 gem 'graphql', '~> 1.7.8'
diff --git a/Gemfile.lock b/Gemfile.lock
index aa4a00eab..ec0fd805c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -61,6 +61,8 @@ GEM
       activerecord (>= 3.2.0)
     arel (6.0.4)
     ast (2.4.0)
+    autoprefixer-rails (8.2.0)
+      execjs
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
@@ -163,7 +165,7 @@ GEM
     faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.23)
-    foundation-rails (6.2.4.0)
+    foundation-rails (6.4.3.0)
       railties (>= 3.1.0)
       sass (>= 3.3.0, < 3.5)
       sprockets-es6 (>= 0.9.0)
@@ -194,7 +196,7 @@ GEM
     httpi (2.4.2)
       rack
       socksify
-    i18n (0.9.1)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     i18n-tasks (0.9.20)
       activesupport (>= 4.0.2)
@@ -261,7 +263,7 @@ GEM
     mimemagic (0.3.2)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
-    minitest (5.11.1)
+    minitest (5.11.3)
     mixlib-cli (1.7.0)
     mixlib-config (2.2.4)
     multi_json (1.12.2)
@@ -321,7 +323,7 @@ GEM
     public_suffix (3.0.1)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.6.8)
+    rack (1.6.9)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (5.0.1)
@@ -465,7 +467,7 @@ GEM
       rack (>= 1.3, < 3)
       rack-accept (~> 0.4)
       tilt (>= 1.4, < 3)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (4.1.3)
       execjs (>= 0.3.0, < 3)
@@ -498,6 +500,8 @@ DEPENDENCIES
   acts_as_votable (~> 0.11.1)
   ahoy_matey (~> 1.6.0)
   ancestry (~> 3.0.1)
+  animate-rails (~> 1.0.10)
+  autoprefixer-rails (~> 8.2.0)
   browser (~> 2.5.2)
   bullet (~> 5.7.0)
   byebug (~> 10.0.0)
@@ -521,7 +525,7 @@ DEPENDENCIES
   email_spec (~> 2.1.0)
   factory_bot_rails (~> 4.8.2)
   faker (~> 1.8.7)
-  foundation-rails (~> 6.2.4.0)
+  foundation-rails (~> 6.4.3.0)
   foundation_rails_helper (~> 2.0.0)
   globalize (~> 5.0.0)
   globalize-accessors (~> 0.2.1)
diff --git a/app/assets/stylesheets/_consul_settings.scss b/app/assets/stylesheets/_consul_settings.scss
index 1f03c9be7..4a083bb62 100644
--- a/app/assets/stylesheets/_consul_settings.scss
+++ b/app/assets/stylesheets/_consul_settings.scss
@@ -10,7 +10,7 @@
 // 1. CONSUL variables
 // --------------------
 
-$base-font-size:      rem-calc(17);
+$base-font-size:      17px;
 $base-line:           rem-calc(26);
 $small-font-size:     rem-calc(14);
 $line-height:         rem-calc(24);
@@ -65,10 +65,47 @@ $alert-bg:          #f2dede;
 $alert-border:      #ebccd1;
 $color-alert:       #a94442;
 
-
 // 2. Foundation settings overrides
 // ---------------------------------
 
+$black: #222;
+$white: #fff;
+
+$body-font-family: 'Source Sans Pro', 'Helvetica', 'Arial', sans-serif !important;
+
+$header-font-family: $body-font-family;
+
+$global-radius: rem-calc(3);
+
+$button-radius: $global-radius;
+
+$font-family-serif: Georgia, 'Times New Roman', Times, serif;
+
+$header-styles: (
+  small: (
+    'h1': ('font-size': 34),
+    'h2': ('font-size': 24),
+    'h3': ('font-size': 20),
+    'h4': ('font-size': 18),
+    'h5': ('font-size': 16),
+    'h6': ('font-size': 14),
+  ),
+  medium: (
+    'h1': ('font-size': 44),
+    'h2': ('font-size': 34),
+    'h3': ('font-size': 24),
+    'h4': ('font-size': 19),
+    'h5': ('font-size': 16),
+    'h6': ('font-size': 13),
+  ),
+);
+
+$small-font-size: rem-calc(14);
+
+$abbr-underline: none;
+
+$tab-background-active: $white;
+
 $accordion-item-color: foreground($accordion-background, $text);
 $accordion-content-color: foreground($accordion-background, $text);
 
@@ -77,3 +114,5 @@ $tab-item-padding: $line-height / 2  0;
 $tab-content-border: $border;
 
 $orbit-bullet-diameter: 0.8rem;
+
+$pagination-radius: $global-radius;
diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss
index 33800fed5..296cccde6 100644
--- a/app/assets/stylesheets/_settings.scss
+++ b/app/assets/stylesheets/_settings.scss
@@ -16,30 +16,49 @@
 //  11. Button
 //  12. Button Group
 //  13. Callout
-//  14. Close Button
-//  15. Drilldown
-//  16. Dropdown
-//  17. Dropdown Menu
-//  18. Flex Video
-//  19. Forms
-//  20. Label
-//  21. Media Object
-//  22. Menu
-//  23. Meter
-//  24. Off-canvas
-//  25. Orbit
-//  26. Pagination
-//  27. Progress Bar
-//  28. Reveal
-//  29. Slider
-//  30. Switch
-//  31. Table
-//  32. Tabs
-//  33. Thumbnail
-//  34. Title Bar
-//  35. Tooltip
-//  36. Top Bar
-//  37. Custom variables
+//  14. Card
+//  15. Close Button
+//  16. Drilldown
+//  17. Dropdown
+//  18. Dropdown Menu
+//  19. Flexbox Utilities
+//  20. Forms
+//  21. Label
+//  22. Media Object
+//  23. Menu
+//  24. Meter
+//  25. Off-canvas
+//  26. Orbit
+//  27. Pagination
+//  28. Progress Bar
+//  29. Prototype Arrow
+//  30. Prototype Border-Box
+//  31. Prototype Border-None
+//  32. Prototype Bordered
+//  33. Prototype Display
+//  34. Prototype Font-Styling
+//  35. Prototype List-Style-Type
+//  36. Prototype Overflow
+//  37. Prototype Position
+//  38. Prototype Rounded
+//  39. Prototype Separator
+//  40. Prototype Shadow
+//  41. Prototype Sizing
+//  42. Prototype Spacing
+//  43. Prototype Text-Decoration
+//  44. Prototype Text-Transformation
+//  45. Prototype Text-Utilities
+//  46. Responsive Embed
+//  47. Reveal
+//  48. Slider
+//  49. Switch
+//  50. Table
+//  51. Tabs
+//  52. Thumbnail
+//  53. Title Bar
+//  54. Tooltip
+//  55. Top Bar
+//  56. Xy Grid
 
 @import 'util/util';
 
@@ -50,28 +69,34 @@ $global-font-size: 100%;
 $global-width: rem-calc(1200);
 $global-lineheight: 1.5;
 $foundation-palette: (
-  primary: #2199e8,
-  secondary: #777,
+  primary: #1779ba,
+  secondary: #767676,
   success: #3adb76,
   warning: #ffae00,
-  alert: #ec5840,
+  alert: #cc4b37,
 );
 $light-gray: #e6e6e6;
 $medium-gray: #cacaca;
 $dark-gray: #8a8a8a;
-$black: #222;
-$white: #fff;
+$black: #0a0a0a;
+$white: #fefefe;
 $body-background: $white;
 $body-font-color: $black;
-$body-font-family: 'Source Sans Pro', 'Helvetica', 'Arial', sans-serif !important;
+$body-font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;
 $body-antialiased: true;
 $global-margin: 1rem;
 $global-padding: 1rem;
+$global-position: 1rem;
 $global-weight-normal: normal;
 $global-weight-bold: bold;
-$global-radius: rem-calc(3);
+$global-radius: 0;
+$global-menu-padding: 0.7rem 1rem;
+$global-menu-nested-margin: 1rem;
 $global-text-direction: ltr;
-$global-flexbox: false;
+$global-flexbox: true;
+$global-prototype-breakpoints: false;
+$global-button-cursor: auto;
+$global-color-pick-contrast-tolerance: 0;
 $print-transparent-backgrounds: true;
 
 @include add-foundation-colors;
@@ -83,7 +108,10 @@ $breakpoints: (
   small: 0,
   medium: 640px,
   large: 1024px,
+  xlarge: 1200px,
+  xxlarge: 1440px,
 );
+$print-breakpoint: large;
 $breakpoint-classes: (small medium large);
 
 // 3. The Grid
@@ -96,6 +124,7 @@ $grid-column-gutter: (
   medium: 30px,
 );
 $grid-column-align-edge: true;
+$grid-column-alias: 'columns';
 $block-grid-max: 8;
 
 // 4. Base Typography
@@ -105,30 +134,29 @@ $header-font-family: $body-font-family;
 $header-font-weight: $global-weight-normal;
 $header-font-style: normal;
 $font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace;
-$font-family-serif: Georgia, 'Times New Roman', Times, serif;
-$header-sizes: (
-  small: (
-    'h1': 34,
-    'h2': 24,
-    'h3': 20,
-    'h4': 18,
-    'h5': 16,
-    'h6': 14,
-  ),
-  medium: (
-    'h1': 44,
-    'h2': 34,
-    'h3': 24,
-    'h4': 19,
-    'h5': 16,
-    'h6': 13,
-  ),
-);
 $header-color: inherit;
 $header-lineheight: 1.4;
 $header-margin-bottom: 0.5rem;
+$header-styles: (
+  small: (
+    'h1': ('font-size': 24),
+    'h2': ('font-size': 20),
+    'h3': ('font-size': 19),
+    'h4': ('font-size': 18),
+    'h5': ('font-size': 17),
+    'h6': ('font-size': 16),
+  ),
+  medium: (
+    'h1': ('font-size': 48),
+    'h2': ('font-size': 40),
+    'h3': ('font-size': 31),
+    'h4': ('font-size': 25),
+    'h5': ('font-size': 20),
+    'h6': ('font-size': 16),
+  ),
+);
 $header-text-rendering: optimizeLegibility;
-$small-font-size: rem-calc(14);
+$small-font-size: 80%;
 $header-small-font-color: $medium-gray;
 $paragraph-lineheight: 1.6;
 $paragraph-margin-bottom: 1rem;
@@ -160,12 +188,13 @@ $blockquote-padding: rem-calc(9 20 0 19);
 $blockquote-border: 1px solid $medium-gray;
 $cite-font-size: rem-calc(13);
 $cite-color: $dark-gray;
+$cite-pseudo-content: '\2014 \0020';
 $keystroke-font: $font-family-monospace;
 $keystroke-color: $black;
 $keystroke-background: $light-gray;
 $keystroke-padding: rem-calc(2 4 0);
 $keystroke-radius: $global-radius;
-$abbr-underline: none;
+$abbr-underline: 1px dotted $black;
 
 // 5. Typography Helpers
 // ---------------------
@@ -184,9 +213,9 @@ $stat-font-size: 2.5rem;
 
 $abide-inputs: true;
 $abide-labels: true;
-$input-background-invalid: map-get($foundation-palette, alert);
-$form-label-color-invalid: map-get($foundation-palette, alert);
-$input-error-color: map-get($foundation-palette, alert);
+$input-background-invalid: get-color(alert);
+$form-label-color-invalid: get-color(alert);
+$input-error-color: get-color(alert);
 $input-error-font-size: rem-calc(12);
 $input-error-font-weight: $global-weight-bold;
 
@@ -195,25 +224,38 @@ $input-error-font-weight: $global-weight-bold;
 
 $accordion-background: $white;
 $accordion-plusminus: true;
-$accordion-item-color: foreground($accordion-background, $primary-color);
+$accordion-title-font-size: rem-calc(12);
+$accordion-item-color: $primary-color;
 $accordion-item-background-hover: $light-gray;
 $accordion-item-padding: 1.25rem 1rem;
 $accordion-content-background: $white;
 $accordion-content-border: 1px solid $light-gray;
-$accordion-content-color: foreground($accordion-background, $primary-color);
+$accordion-content-color: $body-font-color;
 $accordion-content-padding: 1rem;
 
 // 8. Accordion Menu
 // -----------------
 
+$accordionmenu-padding: $global-menu-padding;
+$accordionmenu-nested-margin: $global-menu-nested-margin;
+$accordionmenu-submenu-padding: $accordionmenu-padding;
 $accordionmenu-arrows: true;
 $accordionmenu-arrow-color: $primary-color;
+$accordionmenu-item-background: null;
+$accordionmenu-border: null;
+$accordionmenu-submenu-toggle-background: null;
+$accordion-submenu-toggle-border: $accordionmenu-border;
+$accordionmenu-submenu-toggle-width: 40px;
+$accordionmenu-submenu-toggle-height: $accordionmenu-submenu-toggle-width;
+$accordionmenu-arrow-size: 6px;
 
 // 9. Badge
 // --------
 
 $badge-background: $primary-color;
-$badge-color: foreground($badge-background);
+$badge-color: $white;
+$badge-color-alt: $black;
+$badge-palette: $foundation-palette;
 $badge-padding: 0.3em;
 $badge-minwidth: 2.1em;
 $badge-font-size: 0.6rem;
@@ -228,11 +270,15 @@ $breadcrumbs-item-color-current: $black;
 $breadcrumbs-item-color-disabled: $medium-gray;
 $breadcrumbs-item-margin: 0.75rem;
 $breadcrumbs-item-uppercase: true;
-$breadcrumbs-item-slash: true;
+$breadcrumbs-item-separator: true;
+$breadcrumbs-item-separator-item: '/';
+$breadcrumbs-item-separator-item-rtl: '\\';
+$breadcrumbs-item-separator-color: $medium-gray;
 
 // 11. Button
 // ----------
 
+$button-font-family: inherit;
 $button-padding: 0.85em 1em;
 $button-margin: 0 0 $global-margin 0;
 $button-fill: solid;
@@ -241,13 +287,18 @@ $button-background-hover: scale-color($button-background, $lightness: -15%);
 $button-color: $white;
 $button-color-alt: $black;
 $button-radius: $global-radius;
+$button-hollow-border-width: 1px;
 $button-sizes: (
   tiny: 0.6rem,
   small: 0.75rem,
   default: 0.9rem,
   large: 1.25rem,
 );
+$button-palette: $foundation-palette;
 $button-opacity-disabled: 0.25;
+$button-background-hover-lightness: -20%;
+$button-hollow-hover-lightness: -50%;
+$button-transition: background-color 0.25s ease-out, color 0.25s ease-out;
 
 // 12. Button Group
 // ----------------
@@ -256,6 +307,7 @@ $buttongroup-margin: 1rem;
 $buttongroup-spacing: 1px;
 $buttongroup-child-selector: '.button';
 $buttongroup-expand-max: 6;
+$buttongroup-radius-on-each: true;
 
 // 13. Callout
 // -----------
@@ -270,29 +322,56 @@ $callout-font-color-alt: $body-background;
 $callout-radius: $global-radius;
 $callout-link-tint: 30%;
 
-// 14. Close Button
+// 14. Card
+// --------
+
+$card-background: $white;
+$card-font-color: $body-font-color;
+$card-divider-background: $light-gray;
+$card-border: 1px solid $light-gray;
+$card-shadow: none;
+$card-border-radius: $global-radius;
+$card-padding: $global-padding;
+$card-margin-bottom: $global-margin;
+
+// 15. Close Button
 // ----------------
 
 $closebutton-position: right top;
-$closebutton-offset-horizontal: 1rem;
-$closebutton-offset-vertical: 0.5rem;
-$closebutton-size: 2em;
+$closebutton-offset-horizontal: (
+  small: 0.66rem,
+  medium: 1rem,
+);
+$closebutton-offset-vertical: (
+  small: 0.33em,
+  medium: 0.5rem,
+);
+$closebutton-size: (
+  small: 1.5em,
+  medium: 2em,
+);
 $closebutton-lineheight: 1;
 $closebutton-color: $dark-gray;
 $closebutton-color-hover: $black;
 
-// 15. Drilldown
+// 16. Drilldown
 // -------------
 
 $drilldown-transition: transform 0.15s linear;
 $drilldown-arrows: true;
-$drilldown-arrow-color: $primary-color;
+$drilldown-padding: $global-menu-padding;
+$drilldown-nested-margin: 0;
 $drilldown-background: $white;
+$drilldown-submenu-padding: $drilldown-padding;
+$drilldown-submenu-background: $white;
+$drilldown-arrow-color: $primary-color;
+$drilldown-arrow-size: 6px;
 
-// 16. Dropdown
+// 17. Dropdown
 // ------------
 
 $dropdown-padding: 1rem;
+$dropdown-background: $body-background;
 $dropdown-border: 1px solid $medium-gray;
 $dropdown-font-size: 1rem;
 $dropdown-width: 300px;
@@ -303,23 +382,30 @@ $dropdown-sizes: (
   large: 400px,
 );
 
-// 17. Dropdown Menu
+// 18. Dropdown Menu
 // -----------------
 
 $dropdownmenu-arrows: true;
 $dropdownmenu-arrow-color: $anchor-color;
+$dropdownmenu-arrow-size: 6px;
+$dropdownmenu-arrow-padding: 1.5rem;
 $dropdownmenu-min-width: 200px;
 $dropdownmenu-background: $white;
+$dropdownmenu-submenu-background: $dropdownmenu-background;
+$dropdownmenu-padding: $global-menu-padding;
+$dropdownmenu-nested-margin: 0;
+$dropdownmenu-submenu-padding: $dropdownmenu-padding;
 $dropdownmenu-border: 1px solid $medium-gray;
+$dropdown-menu-item-color-active: get-color(primary);
+$dropdown-menu-item-background-active: transparent;
 
-// 18. Flex Video
-// --------------
+// 19. Flexbox Utilities
+// ---------------------
 
-$flexvideo-margin-bottom: rem-calc(16);
-$flexvideo-ratio: 4 by 3;
-$flexvideo-ratio-widescreen: 16 by 9;
+$flex-source-ordering-count: 6;
+$flexbox-responsive-breakpoints: true;
 
-// 19. Forms
+// 20. Forms
 // ---------
 
 $fieldset-border: 1px solid $medium-gray;
@@ -345,45 +431,56 @@ $input-color: $black;
 $input-placeholder-color: $medium-gray;
 $input-font-family: inherit;
 $input-font-size: rem-calc(16);
+$input-font-weight: $global-weight-normal;
+$input-line-height: $global-lineheight;
 $input-background: $white;
 $input-background-focus: $white;
 $input-background-disabled: $light-gray;
 $input-border: 1px solid $medium-gray;
 $input-border-focus: 1px solid $dark-gray;
+$input-padding: $form-spacing / 2;
 $input-shadow: inset 0 1px 2px rgba($black, 0.1);
 $input-shadow-focus: 0 0 5px $medium-gray;
 $input-cursor-disabled: not-allowed;
 $input-transition: box-shadow 0.5s, border-color 0.25s ease-in-out;
 $input-number-spinners: true;
 $input-radius: $global-radius;
+$form-button-radius: $global-radius;
 
-// 20. Label
+// 21. Label
 // ---------
 
 $label-background: $primary-color;
-$label-color: foreground($label-background);
+$label-color: $white;
+$label-color-alt: $black;
+$label-palette: $foundation-palette;
 $label-font-size: 0.8rem;
 $label-padding: 0.33333rem 0.5rem;
 $label-radius: $global-radius;
 
-// 21. Media Object
+// 22. Media Object
 // ----------------
 
 $mediaobject-margin-bottom: $global-margin;
 $mediaobject-section-padding: $global-padding;
 $mediaobject-image-width-stacked: 100%;
 
-// 22. Menu
+// 23. Menu
 // --------
 
 $menu-margin: 0;
-$menu-margin-nested: 1rem;
-$menu-item-padding: 0.7rem 1rem;
+$menu-nested-margin: $global-menu-nested-margin;
+$menu-items-padding: $global-menu-padding;
+$menu-simple-margin: 1rem;
 $menu-item-color-active: $white;
-$menu-item-background-active: map-get($foundation-palette, primary);
+$menu-item-background-active: get-color(primary);
 $menu-icon-spacing: 0.25rem;
+$menu-item-background-hover: $light-gray;
+$menu-state-back-compat: true;
+$menu-centered-back-compat: true;
+$menu-icons-back-compat: true;
 
-// 23. Meter
+// 24. Meter
 // ---------
 
 $meter-height: 1rem;
@@ -393,20 +490,30 @@ $meter-fill-good: $success-color;
 $meter-fill-medium: $warning-color;
 $meter-fill-bad: $alert-color;
 
-// 24. Off-canvas
+// 25. Off-canvas
 // --------------
 
-$offcanvas-size: 250px;
+$offcanvas-sizes: (
+  small: 250px,
+);
+$offcanvas-vertical-sizes: (
+  small: 250px,
+);
 $offcanvas-background: $light-gray;
-$offcanvas-zindex: -1;
+$offcanvas-shadow: 0 0 10px rgba($black, 0.7);
+$offcanvas-inner-shadow-size: 20px;
+$offcanvas-inner-shadow-color: rgba($black, 0.25);
+$offcanvas-overlay-zindex: 11;
+$offcanvas-push-zindex: 12;
+$offcanvas-overlap-zindex: 13;
+$offcanvas-reveal-zindex: 12;
 $offcanvas-transition-length: 0.5s;
 $offcanvas-transition-timing: ease;
 $offcanvas-fixed-reveal: true;
 $offcanvas-exit-background: rgba($white, 0.25);
 $maincontent-class: 'off-canvas-content';
-$maincontent-shadow: 0 0 10px rgba($black, 0.5);
 
-// 25. Orbit
+// 26. Orbit
 // ---------
 
 $orbit-bullet-background: $medium-gray;
@@ -421,7 +528,7 @@ $orbit-control-background-hover: rgba($black, 0.5);
 $orbit-control-padding: 1rem;
 $orbit-control-zindex: 10;
 
-// 26. Pagination
+// 27. Pagination
 // --------------
 
 $pagination-font-size: rem-calc(14);
@@ -432,13 +539,14 @@ $pagination-item-spacing: rem-calc(1);
 $pagination-radius: $global-radius;
 $pagination-item-background-hover: $light-gray;
 $pagination-item-background-current: $primary-color;
-$pagination-item-color-current: foreground($pagination-item-background-current);
+$pagination-item-color-current: $white;
 $pagination-item-color-disabled: $medium-gray;
 $pagination-ellipsis-color: $black;
 $pagination-mobile-items: false;
+$pagination-mobile-current-item: false;
 $pagination-arrows: true;
 
-// 27. Progress Bar
+// 28. Progress Bar
 // ----------------
 
 $progress-height: 1rem;
@@ -447,7 +555,177 @@ $progress-margin-bottom: $global-margin;
 $progress-meter-background: $primary-color;
 $progress-radius: $global-radius;
 
-// 28. Reveal
+// 29. Prototype Arrow
+// -------------------
+
+$prototype-arrow-directions: (
+  down,
+  up,
+  right,
+  left
+);
+$prototype-arrow-size: 0.4375rem;
+$prototype-arrow-color: $black;
+
+// 30. Prototype Border-Box
+// ------------------------
+
+$prototype-border-box-breakpoints: $global-prototype-breakpoints;
+
+// 31. Prototype Border-None
+// -------------------------
+
+$prototype-border-none-breakpoints: $global-prototype-breakpoints;
+
+// 32. Prototype Bordered
+// ----------------------
+
+$prototype-bordered-breakpoints: $global-prototype-breakpoints;
+$prototype-border-width: rem-calc(1);
+$prototype-border-type: solid;
+$prototype-border-color: $medium-gray;
+
+// 33. Prototype Display
+// ---------------------
+
+$prototype-display-breakpoints: $global-prototype-breakpoints;
+$prototype-display: (
+  inline,
+  inline-block,
+  block,
+  table,
+  table-cell
+);
+
+// 34. Prototype Font-Styling
+// --------------------------
+
+$prototype-font-breakpoints: $global-prototype-breakpoints;
+$prototype-wide-letter-spacing: rem-calc(4);
+$prototype-font-normal: $global-weight-normal;
+$prototype-font-bold: $global-weight-bold;
+
+// 35. Prototype List-Style-Type
+// -----------------------------
+
+$prototype-list-breakpoints: $global-prototype-breakpoints;
+$prototype-style-type-unordered: (
+  disc,
+  circle,
+  square
+);
+$prototype-style-type-ordered: (
+  decimal,
+  lower-alpha,
+  lower-latin,
+  lower-roman,
+  upper-alpha,
+  upper-latin,
+  upper-roman
+);
+
+// 36. Prototype Overflow
+// ----------------------
+
+$prototype-overflow-breakpoints: $global-prototype-breakpoints;
+$prototype-overflow: (
+  visible,
+  hidden,
+  scroll
+);
+
+// 37. Prototype Position
+// ----------------------
+
+$prototype-position-breakpoints: $global-prototype-breakpoints;
+$prototype-position: (
+  static,
+  relative,
+  absolute,
+  fixed
+);
+$prototype-position-z-index: 975;
+
+// 38. Prototype Rounded
+// ---------------------
+
+$prototype-rounded-breakpoints: $global-prototype-breakpoints;
+$prototype-border-radius: rem-calc(3);
+
+// 39. Prototype Separator
+// -----------------------
+
+$prototype-separator-breakpoints: $global-prototype-breakpoints;
+$prototype-separator-align: center;
+$prototype-separator-height: rem-calc(2);
+$prototype-separator-width: 3rem;
+$prototype-separator-background: $primary-color;
+$prototype-separator-margin-top: $global-margin;
+
+// 40. Prototype Shadow
+// --------------------
+
+$prototype-shadow-breakpoints: $global-prototype-breakpoints;
+$prototype-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16),
+                       0 2px 10px 0 rgba(0, 0, 0, 0.12);
+
+// 41. Prototype Sizing
+// --------------------
+
+$prototype-sizing-breakpoints: $global-prototype-breakpoints;
+$prototype-sizing: (
+  width,
+  height
+);
+$prototype-sizes: (
+  25: 25%,
+  50: 50%,
+  75: 75%,
+  100: 100%
+);
+
+// 42. Prototype Spacing
+// ---------------------
+
+$prototype-spacing-breakpoints: $global-prototype-breakpoints;
+$prototype-spacers-count: 3;
+
+// 43. Prototype Text-Decoration
+// -----------------------------
+
+$prototype-decoration-breakpoints: $global-prototype-breakpoints;
+$prototype-text-decoration: (
+  overline,
+  underline,
+  line-through,
+);
+
+// 44. Prototype Text-Transformation
+// ---------------------------------
+
+$prototype-transformation-breakpoints: $global-prototype-breakpoints;
+$prototype-text-transformation: (
+  lowercase,
+  uppercase,
+  capitalize
+);
+
+// 45. Prototype Text-Utilities
+// ----------------------------
+
+$prototype-utilities-breakpoints: $global-prototype-breakpoints;
+$prototype-text-overflow: ellipsis;
+
+// 46. Responsive Embed
+// --------------------
+
+$responsive-embed-margin-bottom: rem-calc(16);
+$responsive-embed-ratios: (
+  default: 4 by 3,
+  widescreen: 16 by 9,
+);
+
+// 47. Reveal
 // ----------
 
 $reveal-background: $white;
@@ -459,7 +737,7 @@ $reveal-radius: $global-radius;
 $reveal-zindex: 1005;
 $reveal-overlay-background: rgba($black, 0.45);
 
-// 29. Slider
+// 48. Slider
 // ----------
 
 $slider-width-vertical: 0.5rem;
@@ -473,7 +751,7 @@ $slider-handle-background: $primary-color;
 $slider-opacity-disabled: 0.25;
 $slider-radius: $global-radius;
 
-// 30. Switch
+// 49. Switch
 // ----------
 
 $switch-background: $medium-gray;
@@ -489,7 +767,7 @@ $switch-paddle-offset: 0.25rem;
 $switch-paddle-radius: $global-radius;
 $switch-paddle-transition: all 0.25s ease-out;
 
-// 31. Table
+// 50. Table
 // ---------
 
 $table-background: $white;
@@ -499,29 +777,36 @@ $table-padding: rem-calc(8 10 10);
 $table-hover-scale: 2%;
 $table-row-hover: darken($table-background, $table-hover-scale);
 $table-row-stripe-hover: darken($table-background, $table-color-scale + $table-hover-scale);
+$table-is-striped: true;
 $table-striped-background: smart-scale($table-background, $table-color-scale);
 $table-stripe: even;
 $table-head-background: smart-scale($table-background, $table-color-scale / 2);
+$table-head-row-hover: darken($table-head-background, $table-hover-scale);
 $table-foot-background: smart-scale($table-background, $table-color-scale);
+$table-foot-row-hover: darken($table-foot-background, $table-hover-scale);
 $table-head-font-color: $body-font-color;
+$table-foot-font-color: $body-font-color;
 $show-header-for-stacked: false;
+$table-stack-breakpoint: medium;
 
-// 32. Tabs
+// 51. Tabs
 // --------
 
 $tab-margin: 0;
 $tab-background: $white;
-$tab-background-active: $white;
+$tab-color: $primary-color;
+$tab-background-active: $light-gray;
+$tab-active-color: $primary-color;
 $tab-item-font-size: rem-calc(12);
 $tab-item-background-hover: $white;
 $tab-item-padding: 1.25rem 1.5rem;
 $tab-expand-max: 6;
 $tab-content-background: $white;
 $tab-content-border: $light-gray;
-$tab-content-color: foreground($tab-background, $primary-color);
+$tab-content-color: $body-font-color;
 $tab-content-padding: 1rem;
 
-// 33. Thumbnail
+// 52. Thumbnail
 // -------------
 
 $thumbnail-border: solid 4px $white;
@@ -531,7 +816,7 @@ $thumbnail-shadow-hover: 0 0 6px 1px rgba($primary-color, 0.5);
 $thumbnail-transition: box-shadow 200ms ease-out;
 $thumbnail-radius: $global-radius;
 
-// 34. Title Bar
+// 53. Title Bar
 // -------------
 
 $titlebar-background: $black;
@@ -542,25 +827,42 @@ $titlebar-icon-color: $white;
 $titlebar-icon-color-hover: $medium-gray;
 $titlebar-icon-spacing: 0.25rem;
 
-// 35. Tooltip
+// 54. Tooltip
 // -----------
 
+$has-tip-cursor: help;
 $has-tip-font-weight: $global-weight-bold;
 $has-tip-border-bottom: dotted 1px $dark-gray;
 $tooltip-background-color: $black;
 $tooltip-color: $white;
 $tooltip-padding: 0.75rem;
+$tooltip-max-width: 10rem;
 $tooltip-font-size: $small-font-size;
 $tooltip-pip-width: 0.75rem;
 $tooltip-pip-height: $tooltip-pip-width * 0.866;
 $tooltip-radius: $global-radius;
 
-// 36. Top Bar
+// 55. Top Bar
 // -----------
 
 $topbar-padding: 0.5rem;
 $topbar-background: $light-gray;
 $topbar-submenu-background: $topbar-background;
-$topbar-title-spacing: 1rem;
+$topbar-title-spacing: 0.5rem 1rem 0.5rem 0;
 $topbar-input-width: 200px;
 $topbar-unstack-breakpoint: medium;
+
+// 56. Xy Grid
+// -----------
+
+$xy-grid: true;
+$grid-container: $global-width;
+$grid-columns: 12;
+$grid-margin-gutters: (
+  small: 20px,
+  medium: 30px
+);
+$grid-padding-gutters: $grid-margin-gutters;
+$grid-container-padding: $grid-padding-gutters;
+$grid-container-max: $global-width;
+$xy-block-grid-max: 8;
diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index d0367a8c1..351859ae0 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -44,26 +44,34 @@ $sidebar-active: #f4fcd0;
     background: #000;
   }
 
+  .admin-top-bar {
+    background: #fff;
+  }
+
   .top-bar {
     background: #fff !important;
     border-bottom: 1px solid #eee;
-    box-shadow: 0 2px 2px #eee;
     color: #000;
     height: auto;
 
+    @include breakpoint(medium) {
+      box-shadow: 0 2px 2px #eee;
+    }
+
     [class^="icon-"]:not(.icon-circle) {
       font-size: $base-font-size;
     }
   }
 
-  .top-bar-title {
+  .menu .menu-text {
 
     h1 {
-      margin-bottom: 0;
       margin-top: $line-height / 2;
+      margin-bottom: 0;
 
       @include breakpoint(medium) {
         margin-left: $line-height / 2;
+        margin-top: 0;
       }
 
       small {
@@ -94,12 +102,17 @@ $sidebar-active: #f4fcd0;
     }
   }
 
-  .menu-icon.dark {
+  .title-bar {
+    color: #000;
+    position: absolute;
+    right: 12px;
+  }
 
-    &::after,
-    &:hover::after {
-      background: #000 !important;
-      box-shadow: 0 7px 0 #000, 0 14px 0 #000 !important;
+  .menu-icon {
+
+    &::after {
+      background: #000;
+      box-shadow: 0 7px 0 #000, 0 14px 0 #000;
     }
   }
 
@@ -186,7 +199,7 @@ $sidebar-active: #f4fcd0;
       margin-bottom: $line-height / 3;
     }
 
-    .active {
+    .is-active {
       border-bottom: 2px solid $admin-color;
       color: $admin-color;
       font-weight: bold;
@@ -231,6 +244,7 @@ $sidebar-active: #f4fcd0;
 }
 
 .admin-content {
+  overflow: scroll;
   padding: $line-height !important;
 }
 
@@ -321,7 +335,7 @@ $sidebar-active: #f4fcd0;
       padding-left: $line-height / 2;
     }
 
-    &.active a {
+    &.is-active a {
       background: $sidebar-hover;
       border-left: 2px solid $sidebar-active;
       font-weight: bold;
@@ -371,7 +385,7 @@ $sidebar-active: #f4fcd0;
       font-weight: normal;
     }
 
-    .active {
+    .is-active {
       border-bottom: 0;
     }
   }
@@ -587,7 +601,7 @@ $sidebar-active: #f4fcd0;
   a {
     display: block;
 
-    &.active {
+    &.is-active {
       color: $brand;
       font-weight: bold;
       text-decoration: underline;
@@ -681,7 +695,7 @@ table {
 }
 
 .legislation-admin {
-  .menu .active > a {
+  .menu .is-active > a {
     background: none;
   }
 }
@@ -698,15 +712,6 @@ table {
   }
 }
 
-.legislation-process-index {
-
-  .legislation-process-new {
-    @include breakpoint(medium) {
-      text-align: right;
-    }
-  }
-}
-
 // 08. CMS
 // --------------
 .cms-page-list {
diff --git a/app/assets/stylesheets/browserslist b/app/assets/stylesheets/browserslist
new file mode 100644
index 000000000..6019618a9
--- /dev/null
+++ b/app/assets/stylesheets/browserslist
@@ -0,0 +1,4 @@
+last 2 versions
+ie >= 9
+Android >= 2.3
+ios >= 7
diff --git a/app/assets/stylesheets/foundation_and_overrides.scss b/app/assets/stylesheets/foundation_and_overrides.scss
index 66640f3f2..99e77f57d 100644
--- a/app/assets/stylesheets/foundation_and_overrides.scss
+++ b/app/assets/stylesheets/foundation_and_overrides.scss
@@ -4,31 +4,38 @@
 @import 'consul_settings';
 @import 'custom_settings';
 @import 'foundation';
+
 @import 'motion-ui/motion-ui';
 
 @include foundation-global-styles;
+// @include foundation-xy-grid-classes;
 @include foundation-grid;
+// @include foundation-flex-grid;
+// @include foundation-flex-classes;
 @include foundation-typography;
-@include foundation-button;
 @include foundation-forms;
-@include foundation-visibility-classes;
-@include foundation-float-classes;
+@include foundation-button;
 @include foundation-accordion;
 @include foundation-accordion-menu;
+@include foundation-badge;
 @include foundation-breadcrumbs;
 @include foundation-button-group;
 @include foundation-callout;
+@include foundation-card;
 @include foundation-close-button;
+@include foundation-menu;
+@include foundation-menu-icon;
 @include foundation-drilldown-menu;
 @include foundation-dropdown;
 @include foundation-dropdown-menu;
-@include foundation-flex-video;
+@include foundation-responsive-embed;
 @include foundation-label;
 @include foundation-media-object;
-@include foundation-menu;
 @include foundation-off-canvas;
+@include foundation-orbit;
 @include foundation-pagination;
 @include foundation-progress-bar;
+@include foundation-slider;
 @include foundation-sticky;
 @include foundation-reveal;
 @include foundation-switch;
@@ -36,9 +43,9 @@
 @include foundation-tabs;
 @include foundation-thumbnail;
 @include foundation-title-bar;
+@include foundation-tooltip;
 @include foundation-top-bar;
-@include foundation-menu-icon;
-@include foundation-orbit;
-
+@include foundation-visibility-classes;
+@include foundation-float-classes;
 @include motion-ui-transitions;
 @include motion-ui-animations;
diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 3a0b73864..c9858accb 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -253,12 +253,21 @@ a {
       }
     }
 
-    &.active {
-      border-bottom: 2px solid $brand;
-      color: $brand;
+    + li {
+      margin-left: 0;
     }
 
-    &:not(.active) {
+    &.is-active {
+      border-bottom: 2px solid $brand;
+      color: $brand;
+      padding-bottom: rem-calc(1);
+
+      h2 a {
+        color: $brand;
+      }
+    }
+
+    &:not(.is-active) {
       margin-bottom: $line-height / 3;
     }
   }
@@ -279,7 +288,7 @@ a {
       color: $text-medium;
       padding: 0;
 
-      &.active {
+      &.is-active {
         font-weight: bold;
         color: $brand;
       }
@@ -289,7 +298,7 @@ a {
       font-size: $base-font-size;
     }
 
-    &.active {
+    &.is-active {
       border-bottom: 2px solid $brand;
       color: $brand;
     }
@@ -404,6 +413,11 @@ a {
   text-transform: uppercase;
 }
 
+figure img {
+  height: 100%;
+  width: 100%;
+}
+
 // 02. Header
 // ----------
 
@@ -436,8 +450,6 @@ header {
 .top-bar {
   background: $brand !important;
   color: #fff;
-  height: $line-height * 2;
-  line-height: $line-height * 2;
   padding-bottom: 0;
   padding-top: 0;
 
@@ -445,30 +457,44 @@ header {
     padding: 0;
   }
 
-  .top-bar-title a {
-    @include logo;
-    line-height: rem-calc(80);
-
-    @include breakpoint(medium) {
-      line-height: rem-calc(80);
-    }
-
-    &:hover {
-      text-decoration: none;
-    }
-  }
-
   ul {
     background: none;
     padding-right: rem-calc(15);
   }
 
+  .menu .menu-text {
+    padding: 0;
+
+    a {
+      color: #fff;
+      display: inline-block;
+      font-family: 'Lato' !important;
+      font-size: rem-calc(24);
+      font-weight: lighter;
+      line-height: $line-height * 2;
+      padding: 0;
+
+      @include breakpoint(medium) {
+        line-height: rem-calc(80);
+        margin-top: 0;
+      }
+
+      img {
+
+        @include breakpoint(medium) {
+          margin-right: $line-height / 2;
+          margin-top: 0;
+        }
+      }
+    }
+  }
+
   .menu > li {
     display: block;
+    width: 100%;
 
     @include breakpoint(medium) {
-      display: table-cell;
-      height: $line-height * 3.5;
+      width: auto;
     }
 
     a {
@@ -482,6 +508,7 @@ header {
     }
 
     .button {
+      background: none;
       text-align: left;
 
       @include breakpoint(medium) {
@@ -492,13 +519,11 @@ header {
     }
   }
 
-  .menu-icon.dark {
-    height: 20px;
+  .has-submenu {
 
-    &::after,
-    &:hover::after {
-      background: #fff;
-      box-shadow: 0 7px 0 #fff, 0 14px 0 #fff;
+    &.is-active a {
+      color: #fff;
+      font-weight: bold;
     }
   }
 
@@ -507,7 +532,7 @@ header {
     &.is-dropdown-submenu {
       background: #fff;
       margin: 0;
-      margin-top: rem-calc(-24);
+      margin-top: rem-calc(-12);
       padding: 0;
       z-index: 9;
     }
@@ -524,6 +549,23 @@ header {
   }
 }
 
+.menu-icon {
+
+  &.dark {
+
+    &:hover::after,
+    &::after {
+      background: #fff;
+      box-shadow: 0 7px 0 #fff, 0 14px 0 #fff;
+    }
+  }
+}
+
+.title-bar {
+  background: none;
+  float: right;
+}
+
 .dropdown.menu > li {
 
   &.is-dropdown-submenu-parent > a::after {
@@ -605,7 +647,7 @@ header {
       }
     }
 
-    &.active {
+    &.is-active {
       color: #fff;
 
       @include breakpoint(medium) {
@@ -652,7 +694,7 @@ header {
 
 .top-bar-right {
 
-  .active {
+  .is-active {
     font-weight: bold;
     text-decoration: underline;
   }
@@ -680,7 +722,7 @@ header {
     }
   }
 
-  .active {
+  .is-active {
     border-bottom: 2px solid $brand;
     color: $brand;
 
@@ -784,7 +826,7 @@ footer {
   color: $link;
 
   &:hover,
-  &.active {
+  &.is-active {
     background: $brand;
     color: #fff;
   }
@@ -1798,7 +1840,7 @@ table {
       }
     }
 
-    &.active {
+    &.is-active {
       background: #43ac6a;
       color: #fff;
     }
@@ -2257,6 +2299,11 @@ table {
   }
 
   .card {
+    padding: $line-height / 2;
+
+    .card {
+      border: 0;
+    }
 
     .card-section {
       margin: 0 auto;
@@ -2615,8 +2662,9 @@ table {
     &.title {
       display: inline-block;
       border-top: 4px solid $brand;
+      margin-bottom: 0;
       min-width: rem-calc(240);
-      padding-top: $line-height / 2;
+      padding: $line-height / 2 0;
     }
   }
 }
@@ -2627,17 +2675,28 @@ table {
     clear: both;
   }
 
-  .debate {
-    margin: $line-height 0;
+  a {
+
+    &.see-all {
+      border-bottom: 1px solid $border;
+      display: block;
+      font-size: $small-font-size;
+      margin: $line-height 0 $line-height / 2;
+      text-align: right;
+      width: 100%;
+    }
   }
 }
 
 .feed-image {
   display: inline-block;
   height: rem-calc(120);
-  margin: $line-height / 2 0;
   overflow: hidden;
 
+  @include breakpoint(medium) {
+    height: rem-calc(96);
+  }
+
   img {
     margin-left: rem-calc(-15);
     max-width: none;
@@ -2647,25 +2706,19 @@ table {
 
 .feed-description {
 
-  @include breakpoint(medium) {
-    padding-top: $line-height;
-  }
-
   p {
     font-size: $small-font-size;
+    margin-bottom: 0;
   }
 }
 
 .feed-content {
-  border-bottom: 1px solid $border;
-  display: inline-block;
 
-  a {
-
-    &.see-all {
-      font-size: $small-font-size;
-      margin: $line-height 0 $line-height / 2;
-    }
+  .debate,
+  .proposal {
+    margin-bottom: 0;
+    margin-top: 0;
+    padding: $line-height / 2 0;
   }
 }
 
diff --git a/app/assets/stylesheets/legislation.scss b/app/assets/stylesheets/legislation.scss
index a3d46a88d..6247b64b9 100644
--- a/app/assets/stylesheets/legislation.scss
+++ b/app/assets/stylesheets/legislation.scss
@@ -48,7 +48,7 @@
         max-width: 80%;
       }
 
-      &.active {
+      &.is-active {
         font-weight: 700;
       }
     }
diff --git a/app/assets/stylesheets/legislation_process.scss b/app/assets/stylesheets/legislation_process.scss
index 1d6bcbc59..5105a459a 100644
--- a/app/assets/stylesheets/legislation_process.scss
+++ b/app/assets/stylesheets/legislation_process.scss
@@ -99,7 +99,7 @@
       }
     }
 
-    .active {
+    .is-active {
       border-bottom: 2px solid $brand;
     }
   }
@@ -244,7 +244,7 @@
       position: relative;
     }
 
-    .active {
+    .is-active {
       background: #ccdbe6;
       border: 0;
     }
diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index 8a6867565..ff7a212ee 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -1350,8 +1350,7 @@
       text-decoration: none;
     }
 
-    a,
-    div {
+    a {
       display: block;
       padding: $line-height / 2;
 
@@ -1536,7 +1535,7 @@
   padding: $line-height / 4;
 }
 
-.select-district .active a {
+.select-district .is-active a {
   background: #f9f9f9;
   border-radius: rem-calc(3);
   color: $budget;
@@ -1629,7 +1628,7 @@
       z-index: 99;
     }
 
-    &.active {
+    &.is-active {
 
       h3 {
         background: $budget;
diff --git a/app/controllers/admin/legislation/processes_controller.rb b/app/controllers/admin/legislation/processes_controller.rb
index 47c7c34c0..976318958 100644
--- a/app/controllers/admin/legislation/processes_controller.rb
+++ b/app/controllers/admin/legislation/processes_controller.rb
@@ -60,7 +60,6 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll
         :draft_publication_enabled,
         :result_publication_enabled,
         :published,
-        :proposals_description,
         :custom_list,
         documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]
       )
diff --git a/app/controllers/admin/poll/booth_assignments_controller.rb b/app/controllers/admin/poll/booth_assignments_controller.rb
index c90eb9cac..ea1f2f28f 100644
--- a/app/controllers/admin/poll/booth_assignments_controller.rb
+++ b/app/controllers/admin/poll/booth_assignments_controller.rb
@@ -55,7 +55,7 @@ class Admin::Poll::BoothAssignmentsController < Admin::Poll::BaseController
   end
 
   def manage
-    @booths = ::Poll::Booth.all
+    @booths = ::Poll::Booth.all.order(name: :asc).page(params[:page]).per(300)
     @poll = Poll.find(params[:poll_id])
   end
 
diff --git a/app/controllers/admin/poll/questions_controller.rb b/app/controllers/admin/poll/questions_controller.rb
index 64ecf4009..399c72788 100644
--- a/app/controllers/admin/poll/questions_controller.rb
+++ b/app/controllers/admin/poll/questions_controller.rb
@@ -55,7 +55,7 @@ class Admin::Poll::QuestionsController < Admin::Poll::BaseController
   private
 
     def question_params
-      params.require(:poll_question).permit(:poll_id, :title, :question, :proposal_id, :video_url)
+      params.require(:poll_question).permit(:poll_id, :title, :question, :proposal_id)
     end
 
     def search_params
diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index c88deba56..ce92b0da5 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -12,12 +12,8 @@ module AdminHelper
     t("#{namespace}.header.title")
   end
 
-  def menu_tags?
-    ["tags"].include?(controller_name)
-  end
-
   def menu_moderated_content?
-    ["proposals", "debates", "comments", "hidden_users"].include?(controller_name) && controller.class.parent != Admin::Legislation
+    ["proposals", "debates", "comments", "hidden_users", "activity"].include?(controller_name) && controller.class.parent != Admin::Legislation
   end
 
   def menu_budget?
@@ -29,15 +25,15 @@ module AdminHelper
   end
 
   def menu_profiles?
-    %w[administrators organizations officials moderators valuators managers users activity].include?(controller_name)
+    %w[administrators organizations officials moderators valuators managers users].include?(controller_name)
   end
 
-  def menu_banners?
-    ["banners"].include?(controller_name)
+  def menu_settings?
+    ["settings", "tags", "geozones", "images", "content_blocks"].include?(controller_name)
   end
 
   def menu_customization?
-    ["pages", "images", "content_blocks"].include?(controller_name) || menu_homepage?
+    ["pages", "banners"].include?(controller_name) || menu_homepage?
   end
 
   def menu_homepage?
diff --git a/app/helpers/budgets_helper.rb b/app/helpers/budgets_helper.rb
index b4a207ed6..d5ca1879c 100644
--- a/app/helpers/budgets_helper.rb
+++ b/app/helpers/budgets_helper.rb
@@ -49,7 +49,7 @@ module BudgetsHelper
 
   def css_for_ballot_heading(heading)
     return '' if current_ballot.blank?
-    current_ballot.has_lines_in_heading?(heading) ? 'active' : ''
+    current_ballot.has_lines_in_heading?(heading) ? 'is-active' : ''
   end
 
   def current_ballot
@@ -66,7 +66,13 @@ module BudgetsHelper
 
   def current_budget_map_locations
     return unless current_budget.present?
-    MapLocation.where(investment_id: current_budget.investments).map { |l| l.json_data }
+    if current_budget.valuating_or_later?
+      investments = current_budget.investments.selected
+    else
+      investments = current_budget.investments
+    end
+
+    MapLocation.where(investment_id: investments).map { |l| l.json_data }
   end
 
   def display_calculate_winners_button?(budget)
diff --git a/app/helpers/layouts_helper.rb b/app/helpers/layouts_helper.rb
index b6da582b5..782d9c639 100644
--- a/app/helpers/layouts_helper.rb
+++ b/app/helpers/layouts_helper.rb
@@ -3,7 +3,7 @@ module LayoutsHelper
   def layout_menu_link_to(text, path, is_active, options)
     if is_active
       content_tag(:span, t('shared.you_are_in'), class: 'show-for-sr') + ' ' +
-        link_to(text, path, options.merge(class: "active"))
+        link_to(text, path, options.merge(class: "is-active"))
     else
       link_to(text, path, options)
     end
diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
index 0b483468f..07d7b380a 100644
--- a/app/helpers/welcome_helper.rb
+++ b/app/helpers/welcome_helper.rb
@@ -1,6 +1,6 @@
 module WelcomeHelper
 
-  def active_class(index)
+  def is_active_class(index)
     "is-active is-in" if index.zero?
   end
 
diff --git a/app/models/budget.rb b/app/models/budget.rb
index 3ba8d5e01..84d511e44 100644
--- a/app/models/budget.rb
+++ b/app/models/budget.rb
@@ -105,6 +105,10 @@ class Budget < ActiveRecord::Base
     Budget::Phase::PUBLISHED_PRICES_PHASES.include?(phase)
   end
 
+  def valuating_or_later?
+    valuating? || publishing_prices? || balloting_or_later?
+  end
+
   def balloting_process?
     balloting? || reviewing_ballots?
   end
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index e72b65985..499f9a54c 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -1,45 +1,61 @@
 <div class="admin-sidebar" data-equalizer-watch>
   <ul id="admin_menu" data-accordion-menu data-multi-open="false">
-
-    <li class="section-title">
-      <a href="#">
-        <span class="icon-proposals"></span>
-        <strong><%= t("admin.menu.title_categories") %></strong>
-      </a>
-      <ul <%= "class=is-active" if menu_tags? %>>
-        <li <%= "class=active" if controller_name == "tags" %>>
-          <%= link_to t("admin.menu.proposals_topics"), admin_tags_path %>
-        </li>
-      </ul>
-    </li>
-
-    <li class="section-title">
-      <a href="#">
-        <span class="icon-eye"></span>
-        <strong><%= t("admin.menu.title_moderated_content") %></strong>
-      </a>
-      <ul <%= "class=is-active" if menu_moderated_content? %>>
-        <% if feature?(:proposals) %>
-          <li <%= "class=active" if controller_name == "proposals" && controller.class.parent != Admin::Legislation %>>
-            <%= link_to t("admin.menu.hidden_proposals"), admin_proposals_path %>
+    <% if feature?(:polls) %>
+      <li class="section-title">
+        <a href="#">
+          <span class="icon-checkmark-circle"></span>
+          <strong><%= t("admin.menu.title_polls") %></strong>
+        </a>
+        <ul id="polls_menu" <%= "class=is-active" if menu_polls? || controller.class.parent == Admin::Poll::Questions::Answers %>>
+          <li <%= "class=is-active" if controller_name == "polls" && action_name != "booth_assignments" ||
+                                    %w(booth_assignments officer_assignments recounts results).include?(controller_name) %>>
+            <%= link_to t("admin.menu.polls"), admin_polls_path %>
           </li>
-        <% end %>
 
-        <% if feature?(:debates) %>
-          <li <%= "class=active" if controller_name == "debates" %>>
-            <%= link_to t("admin.menu.hidden_debates"), admin_debates_path %>
+          <li <%= "class=is-active" if %w(questions answers).include?(controller_name) ||
+                                    controller.class.parent == Admin::Poll::Questions::Answers %>>
+            <%= link_to t("admin.menu.poll_questions"), admin_questions_path %>
           </li>
+
+          <li <%= "class=is-active" if controller_name == "officers" %>>
+            <%= link_to t("admin.menu.poll_officers"), admin_officers_path %>
+          </li>
+
+          <li <%= "class=is-active" if controller_name == "booths" &&
+                                    action_name != "available" %>>
+            <%= link_to t("admin.menu.poll_booths"), admin_booths_path %>
+          </li>
+
+          <li <%= "class=is-active" if (controller_name == "polls" && action_name == "booth_assignments") ||
+                                    (controller_name == "booth_assignments" && action_name == "manage") %>>
+            <%= link_to t("admin.menu.poll_booth_assignments"), booth_assignments_admin_polls_path %>
+          </li>
+
+          <li <%= "class=is-active" if %w(shifts booths).include?(controller_name) &&
+                                    action_name == "available" %>>
+            <%= link_to t("admin.menu.poll_shifts"), available_admin_booths_path %>
+          </li>
+        </ul>
+      </li>
+    <% end %>
+
+    <% if feature?(:legislation) %>
+      <li class="section-title <%= "is-active" if controller.class.parent == Admin::Legislation %>">
+        <%= link_to admin_legislation_processes_path do %>
+          <span class="icon-file-text"></span>
+          <strong><%= t("admin.menu.legislation") %></strong>
         <% end %>
+      </li>
+    <% end %>
 
-        <li <%= "class=active" if controller_name == "comments" %>>
-          <%= link_to t("admin.menu.hidden_comments"), admin_comments_path %>
-        </li>
-
-        <li <%= "class=active" if controller_name == "hidden_users" %>>
-          <%= link_to t("admin.menu.hidden_users"), admin_hidden_users_path %>
-        </li>
-      </ul>
-    </li>
+    <% if feature?(:budgets) %>
+      <li class="section-title <%= "is-active" if controller_name == "budgets" %>">
+        <%= link_to admin_budgets_path do %>
+          <span class="icon-budget"></span>
+          <strong><%= t("admin.menu.budgets") %></strong>
+        <% end %>
+      </li>
+    <% end %>
 
     <% if feature?(:spending_proposals) %>
       <li class="section-title">
@@ -48,114 +64,26 @@
           <strong><%= t("admin.menu.title_budgets") %></strong>
         </a>
         <ul <%= "class=is-active" if menu_budget? %>>
-          <li <%= "class=active" if controller_name == "spending_proposals" %>>
+          <li <%= "class=is-active" if controller_name == "spending_proposals" %>>
             <%= link_to t("admin.menu.spending_proposals"), admin_spending_proposals_path %>
           </li>
         </ul>
       </li>
     <% end %>
 
-    <% if feature?(:polls) %>
-      <li class="section-title">
-        <a href="#">
-          <span class="icon-checkmark-circle"></span>
-          <strong><%= t("admin.menu.title_polls") %></strong>
-        </a>
-        <ul id="polls_menu" <%= "class=is-active" if menu_polls? || controller.class.parent == Admin::Poll::Questions::Answers %>>
-          <li <%= "class=active" if controller_name == "polls" && action_name != "booth_assignments" ||
-                                    %w(booth_assignments officer_assignments recounts results).include?(controller_name) %>>
-            <%= link_to t('admin.menu.polls'), admin_polls_path %>
-          </li>
-
-          <li <%= "class=active" if %w(questions answers).include?(controller_name) ||
-                                    controller.class.parent == Admin::Poll::Questions::Answers %>>
-            <%= link_to t("admin.menu.poll_questions"), admin_questions_path %>
-          </li>
-
-          <li <%= "class=active" if controller_name == "officers" %>>
-            <%= link_to t('admin.menu.poll_officers'), admin_officers_path %>
-          </li>
-
-          <li <%= "class=active" if controller_name == "booths" &&
-                                    action_name != "available" %>>
-            <%= link_to t('admin.menu.poll_booths'), admin_booths_path %>
-          </li>
-
-          <li <%= "class=active" if (controller_name == "polls" && action_name == "booth_assignments") ||
-                                    (controller_name == "booth_assignments" && action_name == "manage") %>>
-            <%= link_to t('admin.menu.poll_booth_assignments'), booth_assignments_admin_polls_path %>
-          </li>
-
-          <li <%= "class=active" if %w(shifts booths).include?(controller_name) &&
-                                    action_name == "available" %>>
-            <%= link_to t('admin.menu.poll_shifts'), available_admin_booths_path %>
-          </li>
-        </ul>
-      </li>
-    <% end %>
-
-    <% if feature?(:budgets) %>
-      <li class="section-title <%= "active" if controller_name == "budgets" %>">
-        <%= link_to admin_budgets_path do %>
-          <span class="icon-budget"></span>
-          <strong><%= t("admin.menu.budgets") %></strong>
-        <% end %>
-      </li>
-    <% end %>
-
-    <li class="section-title">
+    <% messages_sections = %w(newsletters emails_download) %>
+    <% messages_menu_active = messages_sections.include?(controller_name) %>
+    <li class="section-title" <%= "class=is-active" if messages_menu_active %>>
       <a href="#">
-        <span class="icon-organizations"></span>
-        <strong><%= t("admin.menu.title_profiles") %></strong>
+        <span class="icon-zip"></span>
+        <strong><%= t("admin.menu.emails") %></strong>
       </a>
-      <ul <%= "class=is-active" if menu_profiles? %>>
-        <li <%= "class=active" if controller_name == "administrators" %>>
-          <%= link_to t("admin.menu.administrators"), admin_administrators_path %>
+      <ul <%= "class=is-active" if messages_menu_active %>>
+        <li <%= "class=is-active" if controller_name == "newsletters" %>>
+          <%= link_to t("admin.menu.newsletters"), admin_newsletters_path %>
         </li>
-
-        <li <%= "class=active" if controller_name == "organizations" %>>
-          <%= link_to t("admin.menu.organizations"), admin_organizations_path %>
-        </li>
-
-        <li <%= "class=active" if controller_name == "officials" %>>
-          <%= link_to t("admin.menu.officials"), admin_officials_path %>
-        </li>
-
-        <li <%= "class=active" if %w(moderators activity).include?(controller_name) %>>
-          <%= link_to t('admin.menu.moderators'), admin_moderators_path%>
-        </li>
-
-        <li <%= "class=active" if controller_name == "valuators" %>>
-          <%= link_to t('admin.menu.valuators'), admin_valuators_path %>
-        </li>
-
-        <li <%= "class=active" if controller_name == "managers" %>>
-          <%= link_to t('admin.menu.managers'), admin_managers_path %>
-        </li>
-
-        <li <%= 'class=active' if controller_name == 'users' %>>
-          <%= link_to t('admin.menu.users'), admin_users_path %>
-        </li>
-      </ul>
-    </li>
-
-    <% if feature?(:legislation) %>
-      <li class="section-title <%= "active" if controller.class.parent == Admin::Legislation %>">
-        <%= link_to admin_legislation_processes_path do %>
-          <span class="icon-file-text"></span>
-          <strong><%= t("admin.menu.legislation") %></strong>
-        <% end %>
-      </li>
-    <% end %>
-
-    <li class="section-title">
-      <a href="#">
-        <span class="icon-banner"></span>
-        <strong><%= t("admin.menu.title_banners") %></strong>
-      </a>
-      <ul <%= "class=is-active" if menu_banners? %>>
-        <li <%= "class=active" if controller_name == "banners" %>>
-          <%= link_to t("admin.menu.banner"), admin_banners_path %>
+        <li <%= "class=is-active" if controller_name == "emails_download" %>>
+          <%= link_to t("admin.menu.emails_download"), admin_emails_download_index_path %>
         </li>
       </ul>
     </li>
@@ -167,35 +95,23 @@
       </a>
       <ul <%= "class=is-active" if menu_customization? &&
                                    controller.class.parent != Admin::Poll::Questions::Answers %>>
+
         <li <%= "class=active" if menu_homepage? %>>
           <%= link_to t("admin.menu.site_customization.homepage"), admin_homepage_path %>
         </li>
 
-        <li <%= "class=active" if controller_name == "pages" %>>
+        <li <%= "class=is-active" if controller_name == "pages" %>>
           <%= link_to t("admin.menu.site_customization.pages"), admin_site_customization_pages_path %>
         </li>
 
-        <li <%= "class=active" if controller_name == "images" &&
-                                  controller.class.parent != Admin::Poll::Questions::Answers %>>
-          <%= link_to t("admin.menu.site_customization.images"), admin_site_customization_images_path %>
+        <li <%= "class=is-active" if controller_name == "banners" %>>
+          <%= link_to t("admin.menu.banner"), admin_banners_path %>
         </li>
-
-        <li <%= "class=active" if controller_name == "content_blocks" %>>
-          <%= link_to t("admin.menu.site_customization.content_blocks"), admin_site_customization_content_blocks_path%>
-        </li>
-
       </ul>
     </li>
 
-    <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>
-
     <% if feature?(:signature_sheets) %>
-      <li class="section-title <%= "active" if controller_name == "signature_sheets" %>">
+      <li class="section-title <%= "is-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>
@@ -203,26 +119,108 @@
       </li>
     <% end %>
 
-    <li class="section-title" <%= "class=active" if %w(newsletters emails_download).include?(controller_name) %>>
+    <li class="section-title">
       <a href="#">
-        <span class="icon-zip"></span>
-        <strong><%= t("admin.menu.emails") %></strong>
+        <span class="icon-eye"></span>
+        <strong><%= t("admin.menu.title_moderated_content") %></strong>
       </a>
-      <ul id="emails_menu" <%= "class=is-active" if %w(newsletters emails_download).include?(controller_name) %>>
-        <li <%= "class=active" if controller_name == "newsletters" %>>
-          <%= link_to t("admin.menu.newsletters"), admin_newsletters_path %>
+      <ul <%= "class=is-active" if menu_moderated_content? %>>
+        <% if feature?(:proposals) %>
+          <li <%= "class=is-active" if controller_name == "proposals" && controller.class.parent != Admin::Legislation %>>
+            <%= link_to t("admin.menu.hidden_proposals"), admin_proposals_path %>
+          </li>
+        <% end %>
+
+        <% if feature?(:debates) %>
+          <li <%= "class=is-active" if controller_name == "debates" %>>
+            <%= link_to t("admin.menu.hidden_debates"), admin_debates_path %>
+          </li>
+        <% end %>
+
+        <li <%= "class=is-active" if controller_name == "comments" %>>
+          <%= link_to t("admin.menu.hidden_comments"), admin_comments_path %>
         </li>
-        <li <%= "class=active" if controller_name == "emails_download" %>>
-          <%= link_to t("admin.menu.emails_download"), admin_emails_download_index_path %>
+
+        <li <%= "class=is-active" if controller_name == "hidden_users" %>>
+          <%= link_to t("admin.menu.hidden_users"), admin_hidden_users_path %>
+        </li>
+
+        <li <%= "class=is-active" if controller_name == "activity" %>>
+          <%= link_to t("admin.menu.activity"), admin_activity_path %>
         </li>
       </ul>
     </li>
 
-    <li class="section-title <%= "active" if controller_name == "settings" %>">
-      <%= link_to admin_settings_path do %>
-        <span class="icon-settings"></span>
-        <strong><%= t("admin.settings.index.title") %></strong>
+    <li class="section-title">
+      <a href="#">
+        <span class="icon-organizations"></span>
+        <strong><%= t("admin.menu.title_profiles") %></strong>
+      </a>
+      <ul <%= "class=is-active" if menu_profiles? %>>
+        <li <%= "class=is-active" if controller_name == "administrators" %>>
+          <%= link_to t("admin.menu.administrators"), admin_administrators_path %>
+        </li>
+
+        <li <%= "class=is-active" if controller_name == "organizations" %>>
+          <%= link_to t("admin.menu.organizations"), admin_organizations_path %>
+        </li>
+
+        <li <%= "class=is-active" if controller_name == "officials" %>>
+          <%= link_to t("admin.menu.officials"), admin_officials_path %>
+        </li>
+
+        <li <%= "class=is-active" if controller_name == "moderators" %>>
+          <%= link_to t("admin.menu.moderators"), admin_moderators_path%>
+        </li>
+
+        <li <%= "class=is-active" if controller_name == "valuators" %>>
+          <%= link_to t("admin.menu.valuators"), admin_valuators_path %>
+        </li>
+
+        <li <%= "class=is-active" if controller_name == "managers" %>>
+          <%= link_to t("admin.menu.managers"), admin_managers_path %>
+        </li>
+
+        <li <%= "class=is-active" if controller_name == "users" %>>
+          <%= link_to t("admin.menu.users"), admin_users_path %>
+        </li>
+      </ul>
+    </li>
+
+    <li class="section-title" <%= "class=is-active" if controller_name == "stats" %>>
+      <%= link_to admin_stats_path do %>
+        <span class="icon-stats"></span><%= t("admin.menu.stats") %>
       <% end %>
     </li>
+
+    <li class="section-title">
+      <a href="#">
+        <span class="icon-settings"></span>
+        <strong><%= t("admin.menu.title_settings") %></strong>
+      </a>
+      <ul <%="class=is-active" if menu_settings? %>>
+        <li <%= "class=is-active" if controller_name == "settings" %>>
+          <%= link_to t("admin.menu.settings"), admin_settings_path %>
+        </li>
+
+        <li <%= "class=is-active" if controller_name == "tags" %>>
+          <%= link_to t("admin.menu.proposals_topics"), admin_tags_path %>
+        </li>
+
+        <li <%= "class=is-active" if controller_name == "geozones" %>>
+          <%= link_to t("admin.menu.geozones"), admin_geozones_path %>
+        </li>
+
+        <li <%= "class=is-active" if controller_name == "images" &&
+                                  controller.class.parent != Admin::Poll::Questions::Answers %>>
+          <%= link_to t("admin.menu.site_customization.images"), admin_site_customization_images_path %>
+        </li>
+
+        <li <%= "class=is-active" if controller_name == "content_blocks" %>>
+          <%= link_to t("admin.menu.site_customization.content_blocks"), admin_site_customization_content_blocks_path%>
+        </li>
+
+      </ul>
+    </li>
   </ul>
 </div>
diff --git a/app/views/admin/budget_investments/_investments.html.erb b/app/views/admin/budget_investments/_investments.html.erb
index cf1713381..17b0315b1 100644
--- a/app/views/admin/budget_investments/_investments.html.erb
+++ b/app/views/admin/budget_investments/_investments.html.erb
@@ -36,21 +36,18 @@
     <thead>
       <tr>
         <th><%= t("admin.budget_investments.index.table_id") %></th>
-        <th><%= t("admin.budget_investments.index.table_title") %></th>
+        <th class="small-3"><%= t("admin.budget_investments.index.table_title") %></th>
         <th><%= t("admin.budget_investments.index.table_supports") %></th>
         <th><%= t("admin.budget_investments.index.table_admin") %></th>
-        <th><%= t("admin.budget_investments.index.table_valuator") %></th>
-        <th><%= t("admin.budget_investments.index.table_valuation_group") %></th>
+        <th>
+          <%= t("admin.budget_investments.index.table_valuation_group") %>
+          <%= t("admin.budget_investments.index.table_valuator") %>
+        </th>
         <th><%= t("admin.budget_investments.index.table_geozone") %></th>
         <th><%= t("admin.budget_investments.index.table_feasibility") %></th>
         <th class="text-center"><%= t("admin.budget_investments.index.table_valuation_finished") %></th>
-        <th class="text-center">
-          <% if params[:filter] == "under_valuation" %>
-            <%= t("admin.budget_investments.index.table_evaluation") %>
-          <% else %>
-            <%= t("admin.budget_investments.index.table_selection") %>
-          <% end %>
-        </th>
+        <th class="text-center"><%= t("admin.budget_investments.index.table_evaluation") %></th>
+        <th class="text-center"><%= t("admin.budget_investments.index.table_selection") %></th>
         <% if params[:filter]  == "selected" %>
           <th class="text-center"><%= t("admin.budget_investments.index.table_incompatible") %></th>
         <% end %>
@@ -75,20 +72,19 @@
           </td>
           <td class="small">
             <% if investment.administrator.present? %>
-              <span title="<%= t('admin.budget_investments.index.assigned_admin') %>">
+              <span title="<%= t("admin.budget_investments.index.assigned_admin") %>">
                 <%= investment.administrator.name %>
               </span>
             <% else %>
               <%= t("admin.budget_investments.index.no_admin_assigned") %>
             <% end %>
           </td>
-          <td class="small">
-            <% no_valuators_assigned = t("admin.budget_investments.index.no_valuators_assigned") %>
-            <%= investment.assigned_valuators || no_valuators_assigned %>
-          </td>
           <td class="small">
             <% no_valuation_groups = t("admin.budget_investments.index.no_valuation_groups") %>
             <%= investment.assigned_valuation_groups || no_valuation_groups %>
+            <br>
+            <% no_valuators_assigned = t("admin.budget_investments.index.no_valuators_assigned") %>
+            <%= investment.assigned_valuators || no_valuators_assigned %>
           </td>
           <td class="small">
             <%= investment.heading.name %>
@@ -100,15 +96,15 @@
           <td class="small text-center">
             <%= investment.valuation_finished? ? t("shared.yes"): t("shared.no") %>
           </td>
-        <td class="small text-center">
-          <% if params[:filter] == "under_valuation" %>
+          <td class="small text-center">
             <%= form_for [:admin, investment.budget, investment], remote: true do |f| %>
               <%= f.check_box :visible_to_valuators,
                               label: false,
                               class: "js-submit-on-change",
                               id: "budget_investment_visible_to_valuators" %>
             <% end %>
-          <% else %>
+          </td>
+          <td class="small text-center">
             <% if investment.selected? %>
               <%= link_to_unless investment.budget.finished?,
                                  t("admin.budget_investments.index.selected"),
@@ -136,7 +132,6 @@
                                  remote: true,
                                  class: "button small hollow expanded" %>
             <% end %>
-            <% end %>
           </td>
           <% if params[:filter] == "selected" %>
             <td class="small text-center">
diff --git a/app/views/admin/budget_investments/index.html.erb b/app/views/admin/budget_investments/index.html.erb
index 4548e47c0..f2672f564 100644
--- a/app/views/admin/budget_investments/index.html.erb
+++ b/app/views/admin/budget_investments/index.html.erb
@@ -1,3 +1,9 @@
+<div class="float-right">
+  <%= link_to t("admin.budget_investments.index.see_results"),
+              budget_results_path(current_budget, heading_id: current_budget.headings.first),
+              class: "button hollow medium", target: "_blank" %>
+</div>
+
 <h2 class="inline-block"><%= @budget.name %> - <%= t("admin.budget_investments.index.title") %></h2>
 
 <%= render "search_form" %>
diff --git a/app/views/admin/budgets/_form.html.erb b/app/views/admin/budgets/_form.html.erb
index 52a96c077..8de6deae0 100644
--- a/app/views/admin/budgets/_form.html.erb
+++ b/app/views/admin/budgets/_form.html.erb
@@ -4,7 +4,7 @@
 
   <div class="row margin-top">
     <div class="small-12 medium-9 column">
-      <%= f.select :phase, budget_phases_select_options %>
+      <%= f.select :phase, budget_phases_select_options, selected: "drafting" %>
     </div>
     <div class="small-12 medium-3 column">
       <%= f.select :currency_symbol, budget_currency_symbol_select_options %>
diff --git a/app/views/admin/budgets/_groups.html.erb b/app/views/admin/budgets/_groups.html.erb
index 52d09338e..dbee9576c 100644
--- a/app/views/admin/budgets/_groups.html.erb
+++ b/app/views/admin/budgets/_groups.html.erb
@@ -1,16 +1,18 @@
 <h3 class="inline-block"><%= t('admin.budgets.show.groups', count: groups.count) %></h3>
+<%= link_to t("admin.budgets.form.add_group"), "#", class: "button float-right js-toggle-link", data: { "toggle-selector" => "#new-group-form" } %>
+
 <% if groups.blank? %>
-  <div class="callout primary">
+  <div class="callout primary clear">
     <%= t("admin.budgets.form.no_groups") %>
-    <strong><%= link_to t("admin.budgets.form.add_group"), "#",
-                class: "js-toggle-link",
-                data: { "toggle-selector" => "#new-group-form" } %></strong>
   </div>
-<% else %>
-  <%= link_to t("admin.budgets.form.add_group"), "#", class: "button float-right js-toggle-link", data: { "toggle-selector" => "#new-group-form" } %>
 <% end %>
 
-<%= render 'admin/budgets/group_form', budget: @budget, group: Budget::Group.new, id: "new-group-form", button_title: t("admin.budgets.form.create_group"), css_class: '' %>
+<%= render 'admin/budgets/group_form',
+            budget: @budget,
+            group: Budget::Group.new,
+            id: "new-group-form",
+            button_title: t("admin.budgets.form.create_group"),
+            css_class: '' %>
 
 <% groups.each do |group| %>
   <div id="<%= dom_id(group) %>">
diff --git a/app/views/admin/budgets/_heading.html.erb b/app/views/admin/budgets/_heading.html.erb
index da3139a1b..6cef11c9e 100644
--- a/app/views/admin/budgets/_heading.html.erb
+++ b/app/views/admin/budgets/_heading.html.erb
@@ -13,9 +13,6 @@
             edit_admin_budget_budget_group_budget_heading_path(budget_id: group.budget.id, budget_group_id: group.id, id: heading.id),
             class: "button hollow",
             remote: true %>
-    <%= link_to t("admin.budget_investments.index.title"),
-        admin_budget_budget_investments_path(budget_id: group.budget.id, heading_id: heading.id),
-        class: "button hollow"  %>
     <% if heading.can_be_deleted? %>
       <%= link_to t('admin.administrators.administrator.delete'),
           #admin_budget_budget_group_budget_headings_path(group.budget.id, group.id),
diff --git a/app/views/admin/budgets/index.html.erb b/app/views/admin/budgets/index.html.erb
index 6d9c4aee7..d585a9891 100644
--- a/app/views/admin/budgets/index.html.erb
+++ b/app/views/admin/budgets/index.html.erb
@@ -27,8 +27,10 @@
         <td class="small">
           <%= t("budgets.phase.#{budget.phase}") %>
         </td>
-        <td class="small">
-          <%= link_to t("admin.budgets.index.budget_investments"), admin_budget_budget_investments_path(budget_id: budget.id) %>
+        <td>
+          <%= link_to t("admin.budgets.index.budget_investments"),
+                         admin_budget_budget_investments_path(budget_id: budget.id),
+                         class: "button hollow medium" %>
         </td>
         <td class="small">
           <%= link_to t("admin.budgets.index.edit_groups"), admin_budget_path(budget) %>
diff --git a/app/views/admin/comments/index.html.erb b/app/views/admin/comments/index.html.erb
index 4a2c39cce..3af3b7d6e 100644
--- a/app/views/admin/comments/index.html.erb
+++ b/app/views/admin/comments/index.html.erb
@@ -1,4 +1,5 @@
 <h2><%= t("admin.comments.index.title") %></h2>
+<p><%= t("admin.shared.moderated_content") %></p>
 
 <%= render 'shared/filter_subnav', i18n_namespace: "admin.comments.index" %>
 
@@ -7,7 +8,7 @@
 
   <table>
     <thead>
-      <th scope="col" class="small-9"><%= t("admin.shared.description") %></th>
+      <th scope="col" class="small-8"><%= t("admin.shared.description") %></th>
       <th scope="col"><%= t("admin.shared.actions") %></th>
     </thead>
     <tbody>
diff --git a/app/views/admin/debates/index.html.erb b/app/views/admin/debates/index.html.erb
index 7715e1032..c0150dd84 100644
--- a/app/views/admin/debates/index.html.erb
+++ b/app/views/admin/debates/index.html.erb
@@ -1,4 +1,5 @@
 <h2><%= t("admin.debates.index.title") %></h2>
+<p><%= t("admin.shared.moderated_content") %></p>
 
 <%= render 'shared/filter_subnav', i18n_namespace: "admin.debates.index" %>
 
@@ -9,7 +10,7 @@
     <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>
+      <th scope="col" class="small-4"><%= t("admin.shared.actions") %></th>
     </thead>
     <tbody>
     <% @debates.each do |debate| %>
diff --git a/app/views/admin/hidden_users/index.html.erb b/app/views/admin/hidden_users/index.html.erb
index 6bcea253c..87d04d579 100644
--- a/app/views/admin/hidden_users/index.html.erb
+++ b/app/views/admin/hidden_users/index.html.erb
@@ -1,4 +1,5 @@
 <h2><%= t("admin.hidden_users.index.title") %></h2>
+<p><%= t("admin.shared.moderated_content") %></p>
 
 <%= render 'shared/filter_subnav', i18n_namespace: "admin.hidden_users.index" %>
 
@@ -7,7 +8,7 @@
 
   <table>
     <thead>
-      <th scope="col" class="small-9"><%= t("admin.hidden_users.index.user") %></th>
+      <th scope="col" class="small-8"><%= t("admin.hidden_users.index.user") %></th>
       <th scope="col"><%= t("admin.shared.actions") %></th>
     </thead>
     <tbody>
diff --git a/app/views/admin/legislation/processes/_form.html.erb b/app/views/admin/legislation/processes/_form.html.erb
index ba055d9f3..5a0aa668d 100644
--- a/app/views/admin/legislation/processes/_form.html.erb
+++ b/app/views/admin/legislation/processes/_form.html.erb
@@ -81,39 +81,6 @@
     </div>
   </div>
 
-  <div class="row">
-    <div class="small-12 medium-4 column">
-      <label><%= t('admin.legislation.processes.form.allegations_phase') %></label>
-    </div>
-    <div class="small-12 medium-1 column legislation-process-start">
-      <%= t('admin.legislation.processes.form.start') %>
-    </div>
-    <div class="small-12 medium-2 column">
-      <%= f.text_field :allegations_start_date,
-                        label: false,
-                        value: format_date_for_calendar_form(@process.allegations_start_date),
-                        class: "js-calendar-full",
-                        id: "allegations_start_date" %>
-    </div>
-    <div class="small-12 medium-1 column legislation-process-end">
-      <%= t('admin.legislation.processes.form.end') %>
-    </div>
-    <div class="small-12 medium-2 column">
-      <%= f.text_field :allegations_end_date,
-                        label: false,
-                        value: format_date_for_calendar_form(@process.allegations_end_date),
-                        class: "js-calendar-full",
-                        id: "allegations_end_date" %>
-    </div>
-    <div class="small-12 medium-2 column">
-      <%= f.check_box :allegations_phase_enabled, checked: @process.allegations_phase.enabled?, label: t('admin.legislation.processes.form.enabled') %>
-    </div>
-
-    <div class="small-12 column">
-      <hr>
-    </div>
-  </div>
-
   <div class="row">
     <div class="small-12 medium-4 column">
       <label><%= t('admin.legislation.processes.form.proposals_phase') %></label>
@@ -147,6 +114,39 @@
     </div>
   </div>
 
+  <div class="row">
+    <div class="small-12 medium-4 column">
+      <label><%= t('admin.legislation.processes.form.allegations_phase') %></label>
+    </div>
+    <div class="small-12 medium-1 column legislation-process-start">
+      <%= t('admin.legislation.processes.form.start') %>
+    </div>
+    <div class="small-12 medium-2 column">
+      <%= f.text_field :allegations_start_date,
+                        label: false,
+                        value: format_date_for_calendar_form(@process.allegations_start_date),
+                        class: "js-calendar-full",
+                        id: "allegations_start_date" %>
+    </div>
+    <div class="small-12 medium-1 column legislation-process-end">
+      <%= t('admin.legislation.processes.form.end') %>
+    </div>
+    <div class="small-12 medium-2 column">
+      <%= f.text_field :allegations_end_date,
+                        label: false,
+                        value: format_date_for_calendar_form(@process.allegations_end_date),
+                        class: "js-calendar-full",
+                        id: "allegations_end_date" %>
+    </div>
+    <div class="small-12 medium-2 column">
+      <%= f.check_box :allegations_phase_enabled, checked: @process.allegations_phase.enabled?, label: t('admin.legislation.processes.form.enabled') %>
+    </div>
+
+    <div class="small-12 column">
+      <hr>
+    </div>
+  </div>
+
   <div class="row">
     <div class="small-12 medium-4 column">
       <%= f.label :draft_publication_date %>
diff --git a/app/views/admin/legislation/processes/_subnav.html.erb b/app/views/admin/legislation/processes/_subnav.html.erb
index 0b8c55840..2bfa9dd1d 100644
--- a/app/views/admin/legislation/processes/_subnav.html.erb
+++ b/app/views/admin/legislation/processes/_subnav.html.erb
@@ -1,6 +1,6 @@
 <ul class="menu simple clear">
   <% if active == 'info' %>
-    <li class="active">
+    <li class="is-active">
       <h2><%= t("admin.legislation.processes.subnav.info") %></h2>
     </li>
   <% else %>
@@ -10,7 +10,7 @@
   <% end %>
 
   <% if active == 'questions' %>
-    <li class="active">
+    <li class="is-active">
       <h2><%= t("admin.legislation.processes.subnav.questions") %></h2>
     </li>
   <% else %>
@@ -20,7 +20,7 @@
   <% end %>
 
   <% if active == 'proposals' %>
-    <li class="active">
+    <li class="is-active">
       <h2><%= t("admin.legislation.processes.subnav.proposals") %></h2>
     </li>
   <% else %>
@@ -30,7 +30,7 @@
   <% end %>
 
   <% if active == 'draft_versions' %>
-    <li class="active">
+    <li class="is-active">
       <h2><%= t("admin.legislation.processes.subnav.draft_texts") %></h2>
     </li>
   <% else %>
diff --git a/app/views/admin/legislation/processes/index.html.erb b/app/views/admin/legislation/processes/index.html.erb
index ed96ac2c0..165865326 100644
--- a/app/views/admin/legislation/processes/index.html.erb
+++ b/app/views/admin/legislation/processes/index.html.erb
@@ -2,32 +2,28 @@
   Admin - <%= t("admin.menu.legislation") %> - <%= t("admin.legislation.processes.index.filters.#{@current_filter}") %>
 <% end %>
 
-<div class="legislation-admin legislation-process-index">
-  <div class="row">
-    <div class="small-12 medium-9 column">
-      <h2 class="inline-block"><%= t("admin.legislation.processes.index.title") %></h2>
-    </div>
-    <div class="small-12 medium-3 column legislation-process-new">
-      <%= link_to t("admin.legislation.processes.index.create"), new_admin_legislation_process_path, class: "button" %>
-    </div>
-  </div>
+<h2 class="inline-block"><%= t("admin.legislation.processes.index.title") %></h2>
 
-  <%= render 'shared/filter_subnav', i18n_namespace: "admin.legislation.processes.index" %>
+<%= link_to t("admin.legislation.processes.index.create"), new_admin_legislation_process_path,
+            class: "button success float-right" %>
 
-  <% if @processes.any? %>
-    <h3><%= page_entries_info @processes %></h3>
+<%= render 'shared/filter_subnav', i18n_namespace: "admin.legislation.processes.index" %>
 
-    <table class="stack">
-      <thead>
-        <tr>
-          <th><%= t("admin.legislation.processes.process.title") %></th>
-          <th><%= t("admin.legislation.processes.process.status") %></th>
-          <th><%= t("admin.legislation.processes.process.creation_date") %></th>
-          <th><%= t("admin.legislation.processes.process.comments") %></th>
-          <th></th>
-        </tr>
-      </thead>
-      <tbody>
+<% if @processes.any? %>
+  <h3><%= page_entries_info @processes %></h3>
+
+  <table class="stack">
+    <thead>
+      <tr>
+        <th><%= t("admin.legislation.processes.process.title") %></th>
+        <th><%= t("admin.legislation.processes.process.status") %></th>
+        <th><%= t("admin.legislation.processes.process.creation_date") %></th>
+        <th><%= t("admin.legislation.processes.process.comments") %></th>
+        <th><%= t("admin.actions.actions") %></th>
+      </tr>
+    </thead>
+
+    <tbody>
       <% @processes.each do |process| %>
         <tr id="<%= dom_id(process) %>">
           <td class="small-12 medium-8">
@@ -43,14 +39,12 @@
           </td>
         </tr>
       <% end %>
-      </tbody>
-    </table>
+    </tbody>
+  </table>
 
-    <%= paginate @processes %>
-  <% else %>
-    <div class="callout primary">
-      <%= page_entries_info @processes %>
-    </div>
-  <% end %>
-
-</div>
+  <%= paginate @processes %>
+<% else %>
+  <div class="callout primary">
+    <%= page_entries_info @processes %>
+  </div>
+<% end %>
diff --git a/app/views/admin/legislation/proposals/_form.html.erb b/app/views/admin/legislation/proposals/_form.html.erb
index dd12f9492..cca190440 100644
--- a/app/views/admin/legislation/proposals/_form.html.erb
+++ b/app/views/admin/legislation/proposals/_form.html.erb
@@ -15,19 +15,6 @@
 
   <% end %>
 
-  <div class="row">
-    <div class="small-12 medium-4 column">
-      <%= label_tag t('admin.legislation.proposals.form.header_information') %>
-      <small><%= t('admin.legislation.proposals.form.header_information_description') %></small>
-    </div>
-    <div class="small-12 medium-8 column">
-      <%= f.text_area :proposals_description,
-                       label: false,
-                       rows: 5,
-                       placeholder: t('admin.legislation.proposals.form.header_information_placeholder') %>
-    </div>
-  </div>
-
   <div class="row">
     <div class="small-12 medium-4 column">
       <%= label_tag t('admin.legislation.proposals.form.custom_categories') %>
diff --git a/app/views/admin/legislation/questions/_form.html.erb b/app/views/admin/legislation/questions/_form.html.erb
index 1843f6c3a..c0b321eed 100644
--- a/app/views/admin/legislation/questions/_form.html.erb
+++ b/app/views/admin/legislation/questions/_form.html.erb
@@ -1,40 +1,41 @@
 <%= form_for [:admin, @process, @question], url: url, html: {data: {watch_changes: true}} do |f| %>
 
   <% if @question.errors.any? %>
-    <div id="error_explanation" data-alert class="callout alert" data-closable>
-      <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
-        <span aria-hidden="true">&times;</span>
-      </button>
+    <div class="small-12 medium-9 column">
+      <div id="error_explanation" data-alert class="callout alert" data-closable>
+        <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
+          <span aria-hidden="true">&times;</span>
+        </button>
 
-      <strong>
-        <%= @question.errors.count %>
-        <%= t("admin.legislation.questions.errors.form.error", count: @question.errors.count) %>
-      </strong>
+        <strong>
+          <%= @question.errors.count %>
+          <%= t("admin.legislation.questions.errors.form.error", count: @question.errors.count) %>
+        </strong>
+      </div>
     </div>
   <% end %>
 
-  <div class="small-12 medium-4 column">
-    <%= f.label :title %>
-  </div>
-  <div class="small-12 medium-8 column">
-    <%= f.text_area :title, rows: 5, label: false, placeholder: t('admin.legislation.questions.form.title_placeholder') %>
+  <div class="small-12 medium-9 column">
+    <%= f.label :title, t("admin.legislation.questions.form.title") %>
+    <%= f.text_area :title, rows: 5, label: false, placeholder: t("admin.legislation.questions.form.title_placeholder") %>
   </div>
 
-  <div class="small-12 medium-4 column">
-    <%= f.label :question_options %>
+  <div class="small-12 medium-9 column">
+    <%= f.label :question_options, t("admin.legislation.questions.form.question_options") %>
   </div>
-  <div class="small-12 medium-8 column">
+
+  <div>
     <%= f.fields_for :question_options do |ff| %>
       <%= render 'question_option_fields', f: ff %>
     <% end %>
   </div>
-  <div class="small-12 medium-8 column">
-    <%= link_to_add_association t('.add_option'), f, :question_options %>
+
+  <div class="small-12 medium-9 column margin">
+    <%= link_to_add_association t("admin.legislation.questions.form.add_option"),
+                                f, :question_options, class: "button hollow medium" %>
   </div>
 
-  <div class="row">
-    <div class="actions small-12 medium-3 column legislation-process-save">
-      <%= f.submit(class: "button expanded", value: t("admin.legislation.questions.#{admin_submit_action(@question)}.submit_button")) %>
-    </div>
+  <div class="small-12 medium-6 large-4 column end">
+    <%= f.submit(class: "button expanded", value: t("admin.legislation.questions.#{admin_submit_action(@question)}.submit_button")) %>
   </div>
 <% end %>
diff --git a/app/views/admin/legislation/questions/_question_option_fields.html.erb b/app/views/admin/legislation/questions/_question_option_fields.html.erb
index ef77872fa..6afdfecad 100644
--- a/app/views/admin/legislation/questions/_question_option_fields.html.erb
+++ b/app/views/admin/legislation/questions/_question_option_fields.html.erb
@@ -1,11 +1,12 @@
 <div class="nested-fields">
   <div class="field">
-  <div class="row">
-    <div class="small-12 medium-9 column">
-      <%= f.text_field :value, label: false, placeholder: t('admin.legislation.questions.form.value_placeholder') %>
-    </div>
-    <div class="small-12 medium-3 column">
-      <%= link_to_remove_association "<span class=\"icon-x\" aria-hidden=\"true\"></span> <span>#{t('.remove_option')}</span>".html_safe, f %>
+    <div class="row">
+      <div class="small-12 medium-9 column">
+        <%= f.text_field :value, label: false, placeholder: t("admin.legislation.questions.form.value_placeholder") %>
+      </div>
+      <div class="small-12 medium-3 column">
+        <%= link_to_remove_association "<span class=\"icon-x\" aria-hidden=\"true\"></span> <span>#{t(".remove_option")}</span>".html_safe, f %>
+      </div>
     </div>
   </div>
 </div>
diff --git a/app/views/admin/moderators/index.html.erb b/app/views/admin/moderators/index.html.erb
index be067d73d..f417e96e5 100644
--- a/app/views/admin/moderators/index.html.erb
+++ b/app/views/admin/moderators/index.html.erb
@@ -1,4 +1,4 @@
-<%= link_to t('admin.menu.activity'), admin_activity_path, class: "button hollow float-right" %>
+<%= link_to t('admin.menu.activity'), admin_activity_path, class: "button float-right" %>
 
 <h2 class="inline-block"><%= t("admin.moderators.index.title") %></h2>
 
diff --git a/app/views/admin/newsletters/_form.html.erb b/app/views/admin/newsletters/_form.html.erb
index bf6b71d5b..994635718 100644
--- a/app/views/admin/newsletters/_form.html.erb
+++ b/app/views/admin/newsletters/_form.html.erb
@@ -4,7 +4,8 @@
   <%= f.select :segment_recipient, options_for_select(user_segments_options,
                                                       @newsletter[:segment_recipient]) %>
   <%= f.text_field :subject %>
-  <%= f.text_field :from %>
+  <%= f.label :from, t("admin.newsletters.new.from") %>
+  <%= f.text_field :from, label: false %>
   <%= f.cktext_area :body, ckeditor: { language: I18n.locale } %>
 
   <div class="margin-top">
diff --git a/app/views/admin/newsletters/show.html.erb b/app/views/admin/newsletters/show.html.erb
index 55cc6aabe..64b1d7725 100644
--- a/app/views/admin/newsletters/show.html.erb
+++ b/app/views/admin/newsletters/show.html.erb
@@ -7,7 +7,7 @@
 <div class="small-12 column">
   <div class="callout highlight">
     <div class="row">
-      <div class="small-12 medium-4 column">
+      <div class="small-12 medium-2 column">
         <strong><%= t("admin.newsletters.show.sent_at") %></strong><br>
         <% if @newsletter.draft? %>
           <%= t("admin.newsletters.index.draft") %>
@@ -15,7 +15,7 @@
           <%= l @newsletter.sent_at.to_date %>
         <% end %>
       </div>
-      <div class="small-12 medium-4 column">
+      <div class="small-12 medium-6 column">
         <strong><%= t("admin.newsletters.show.from") %></strong><br>
         <%= @newsletter.from %>
       </div>
@@ -24,7 +24,7 @@
         <%= @newsletter.subject %>
       </div>
     </div>
-    <div class="row">
+    <div class="row margin-top">
       <div class="small-12 column">
         <strong><%= t("admin.newsletters.show.segment_recipient") %></strong><br>
         <%= segment_name(@newsletter.segment_recipient) %>
@@ -38,7 +38,17 @@
     <%= t("admin.newsletters.show.body_help_text") %>
   </p>
   <div class="newsletter-body-content">
-    <%= render file: "app/views/mailer/newsletter.html.erb", layout: '/app/views/layouts/mailer.html.erb' %>
+    <%= render file: "app/views/layouts/_mailer_header.html.erb" %>
+
+    <table cellpadding="0" cellspacing="0" border="0" style="background: #fff; margin: 0 auto; max-width: 700px; width:100%;">
+      <tbody>
+        <tr>
+          <%= render file: "app/views/mailer/newsletter.html.erb" %>
+        </tr>
+      </tbody>
+    </table>
+
+    <%= render file: "app/views/layouts/_mailer_footer.html.erb" %>
   </div>
 </div>
 
diff --git a/app/views/admin/poll/booth_assignments/manage.html.erb b/app/views/admin/poll/booth_assignments/manage.html.erb
index a24fac478..b7d619c71 100644
--- a/app/views/admin/poll/booth_assignments/manage.html.erb
+++ b/app/views/admin/poll/booth_assignments/manage.html.erb
@@ -25,4 +25,6 @@
     <% end %>
     </tbody>
   </table>
+
+  <%= paginate @booths %>
 <% end %>
diff --git a/app/views/admin/poll/booth_assignments/show.html.erb b/app/views/admin/poll/booth_assignments/show.html.erb
index 71938cce5..e9dafe8f1 100644
--- a/app/views/admin/poll/booth_assignments/show.html.erb
+++ b/app/views/admin/poll/booth_assignments/show.html.erb
@@ -12,20 +12,25 @@
   </p>
 <% end %>
 
-<div class="tabs-content" data-tabs-content="booths-tabs">
-  <ul class="tabs" data-tabs id="booths-tabs">
-    <li class="tabs-title">
-      <%= link_to t("admin.poll_booth_assignments.show.officers"), "#tab-officers" %>
-    </li>
-    <li class="tabs-title">
-      <%= link_to t("admin.poll_booth_assignments.show.recounts"), "#tab-recounts" %>
-    </li>
-    <li class="tabs-title is-active">
-      <%= link_to t("admin.poll_booth_assignments.show.results"), "#tab-results" %>
-    </li>
-  </ul>
+<ul class="tabs" id="booths_tabs" role="tablist"
+    data-deep-link="true"
+    data-update-history="true"
+    data-deep-link-smudge="true"
+    data-deep-link-smudge-delay="500"
+    data-tabs>
+  <li class="tabs-title">
+    <%= link_to t("admin.poll_booth_assignments.show.officers"), "#tab-officers" %>
+  </li>
+  <li class="tabs-title">
+    <%= link_to t("admin.poll_booth_assignments.show.recounts"), "#tab-recounts" %>
+  </li>
+  <li class="tabs-title is-active">
+    <%= link_to t("admin.poll_booth_assignments.show.results"), "#tab-results" %>
+  </li>
+</ul>
 
-  <div class="tabs-panel" id="tab-officers">
+<div class="tabs-content" data-tabs-content="booths_tabs" role="tablist">
+  <div class="tabs-panel" id="tab-officers" role="tab">
     <% if @booth_assignment.officers.empty? %>
       <div class="callout primary margin-top">
         <%= t("admin.poll_booth_assignments.show.no_officers") %>
@@ -46,7 +51,7 @@
     <% end %>
   </div>
 
-  <div class="tabs-panel" id="tab-recounts">
+  <div class="tabs-panel" id="tab-recounts" role="tab">
     <h3><%= t("admin.poll_booth_assignments.show.recounts_list") %></h3>
 
     <table id="totals">
@@ -86,7 +91,7 @@
       </tbody>
     </table>
   </div>
-  <div class="tabs-panel is-active" id="tab-results">
+  <div class="tabs-panel is-active" id="tab-results" role="tab">
     <%= render "results" %>
   </div>
 </div>
diff --git a/app/views/admin/poll/polls/_form.html.erb b/app/views/admin/poll/polls/_form.html.erb
index e802d1217..1a45b8097 100644
--- a/app/views/admin/poll/polls/_form.html.erb
+++ b/app/views/admin/poll/polls/_form.html.erb
@@ -55,17 +55,6 @@
     </div>
   </div>
 
-  <% if controller_name == "polls" && action_name == "edit" %>
-    <div class="row">
-      <fieldset class="fieldset">
-        <legend><%= t('admin.polls.new.show_results_and_stats') %></legend>
-        <%= f.check_box :results_enabled, checked: @poll.results_enabled?, label: t('admin.polls.new.show_results') %>
-        <%= f.check_box :stats_enabled, checked: @poll.stats_enabled?, label: t('admin.polls.new.show_stats') %>
-        <p class="small"><%= t('admin.polls.new.results_and_stats_reminder') %></p>
-      </fieldset>
-    </div>
-  <% end %>
-
   <div class="row">
     <div class="small-12 medium-4 column">
       <%= f.submit t("admin.polls.#{admin_submit_action(@poll)}.submit_button"),
diff --git a/app/views/admin/poll/polls/_subnav.html.erb b/app/views/admin/poll/polls/_subnav.html.erb
index 24d7a5b1f..98e23003b 100644
--- a/app/views/admin/poll/polls/_subnav.html.erb
+++ b/app/views/admin/poll/polls/_subnav.html.erb
@@ -1,6 +1,6 @@
 <ul class="menu simple clear" id="assigned-resources-tabs">
   <% if controller_name == "polls" %>
-    <li class="active">
+    <li class="is-active">
       <h2>
         <%= t("admin.polls.show.questions_tab") %>
         (<%= @poll.questions.count %>)
@@ -16,7 +16,7 @@
   <% end %>
 
   <% if controller_name == "booth_assignments" %>
-    <li class="active">
+    <li class="is-active">
       <h2>
         <%= t("admin.polls.show.booths_tab") %>
         (<%= @poll.booth_assignments.select(:booth_id).distinct.count %>)
@@ -32,7 +32,7 @@
   <% end %>
 
   <% if controller_name == "officer_assignments" %>
-    <li class="active">
+    <li class="is-active">
       <h2>
         <%= t("admin.polls.show.officers_tab") %>
         (<%= @poll.officer_assignments.select(:officer_id).distinct.count %>)
@@ -48,7 +48,7 @@
   <% end %>
 
   <% if controller_name == "recounts" %>
-    <li class="active">
+    <li class="is-active">
       <h2>
         <%= t("admin.polls.show.recounts_tab") %>
       </h2>
@@ -60,7 +60,7 @@
   <% end %>
 
   <% if controller_name == "results" %>
-    <li class="active">
+    <li class="is-active">
       <h2>
         <%= t("admin.polls.show.results_tab") %>
       </h2>
diff --git a/app/views/admin/poll/questions/_form.html.erb b/app/views/admin/poll/questions/_form.html.erb
index 17ebde59d..eeb38a405 100644
--- a/app/views/admin/poll/questions/_form.html.erb
+++ b/app/views/admin/poll/questions/_form.html.erb
@@ -14,19 +14,6 @@
 
     <%= f.text_field :title %>
 
-    <div class="small-12">
-      <%= f.label :video_url, t("proposals.form.proposal_video_url") %>
-
-      <p class="help-text" id="video-url-help-text">
-        <%= t("proposals.form.proposal_video_url_note") %>
-      </p>
-
-      <%= f.text_field :video_url,
-                        placeholder: t("proposals.form.proposal_video_url"),
-                        label: false,
-                        aria: {describedby: "video-url-help-text"} %>
-    </div>
-
     <div class="small-12 medium-6 large-4 margin-top">
       <%= f.submit(class: "button expanded", value: t("shared.save")) %>
     </div>
diff --git a/app/views/admin/poll/questions/index.html.erb b/app/views/admin/poll/questions/index.html.erb
index 5a326d8f4..e19811253 100644
--- a/app/views/admin/poll/questions/index.html.erb
+++ b/app/views/admin/poll/questions/index.html.erb
@@ -7,14 +7,14 @@
   <%= render 'search' %>
 </div>
 
-<div class="tabs-content" data-tabs-content="questions-tabs">
+<div class="tabs-content" data-tabs-content="questions-tabs" role="tablist">
   <%= render "filter_subnav" %>
 
-  <div class="tabs-panel is-active" id="tab-questions">
+  <div class="tabs-panel is-active" id="tab-questions" role="tab">
     <%= render "questions" %>
   </div>
 
-  <div class="tabs-panel" id="tab-successful-proposals">
+  <div class="tabs-panel" id="tab-successful-proposals" role="tab">
     <%= render "successful_proposals" %>
   </div>
 </div>
diff --git a/app/views/admin/poll/results/_show_results.html.erb b/app/views/admin/poll/results/_show_results.html.erb
new file mode 100644
index 000000000..e607f4779
--- /dev/null
+++ b/app/views/admin/poll/results/_show_results.html.erb
@@ -0,0 +1,14 @@
+<%= form_for [:admin, @poll], action: "update" do |f| %>
+  <fieldset class="fieldset">
+    <legend><%= t("admin.polls.new.show_results_and_stats") %></legend>
+    <%= f.check_box :results_enabled, checked: @poll.results_enabled?, label: t("admin.polls.new.show_results") %>
+    <%= f.check_box :stats_enabled, checked: @poll.stats_enabled?, label: t("admin.polls.new.show_stats") %>
+    <p class="small"><%= t("admin.polls.new.results_and_stats_reminder") %></p>
+  </fieldset>
+
+
+  <div class="small-12 medium-4 large-2">
+    <%= f.submit t("admin.polls.#{admin_submit_action(@poll)}.submit_button"),
+                 class: "button success expanded" %>
+  </div>
+<% end %>
diff --git a/app/views/admin/poll/results/index.html.erb b/app/views/admin/poll/results/index.html.erb
index 7f21e5452..6f1fbbe74 100644
--- a/app/views/admin/poll/results/index.html.erb
+++ b/app/views/admin/poll/results/index.html.erb
@@ -1,4 +1,5 @@
 <%= render "/admin/poll/polls/poll_header" %>
+
 <div id="poll-resources">
   <%= render "/admin/poll/polls/subnav" %>
 
@@ -12,5 +13,6 @@
     <%= render "recount", resource: @poll %>
     <%= render "result" %>
     <%= render "results_by_booth" %>
+    <%= render "show_results", resource: @poll %>
   <% end %>
 </div>
diff --git a/app/views/admin/proposals/index.html.erb b/app/views/admin/proposals/index.html.erb
index ba161ce77..0f94e276f 100644
--- a/app/views/admin/proposals/index.html.erb
+++ b/app/views/admin/proposals/index.html.erb
@@ -1,4 +1,5 @@
 <h2><%= t("admin.proposals.index.title") %></h2>
+<p><%= t("admin.shared.moderated_content") %></p>
 
 <%= render 'shared/filter_subnav', i18n_namespace: "admin.proposals.index" %>
 
@@ -9,7 +10,7 @@
     <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>
+      <th scope="col" class="small-4"><%= t("admin.shared.actions") %></th>
     </thead>
     <tbody>
     <% @proposals.each do |proposal| %>
diff --git a/app/views/admin/site_customization/content_blocks/_form.html.erb b/app/views/admin/site_customization/content_blocks/_form.html.erb
index ae9d684d4..ca89b8781 100644
--- a/app/views/admin/site_customization/content_blocks/_form.html.erb
+++ b/app/views/admin/site_customization/content_blocks/_form.html.erb
@@ -34,15 +34,3 @@
   </div>
 
 <% end %>
-
-<h3><%= t('.content_blocks_information') %></h3>
-
-<p><%= t('.content_block_about') %></p>
-
-<p><%= t('.content_block_top_links_html') %></p>
-
-<code>&lt;li&gt;&lt;a href=&quot;http://site1.com&quot;&gt;Site 1&lt;/a&gt;&lt;/li&gt;</code><br>
-<code>&lt;li&gt;&lt;a href=&quot;http://site2.com&quot;&gt;Site 2&lt;/a&gt;&lt;/li&gt;</code><br>
-<code>&lt;li&gt;&lt;a href=&quot;http://site3.com&quot;&gt;Site 3&lt;/a&gt;&lt;/li&gt;</code><br>
-
-<p class="margin-top"><%= t('.content_block_footer_html') %></p>
diff --git a/app/views/admin/site_customization/content_blocks/index.html.erb b/app/views/admin/site_customization/content_blocks/index.html.erb
index 455ac634f..fc762c1fd 100644
--- a/app/views/admin/site_customization/content_blocks/index.html.erb
+++ b/app/views/admin/site_customization/content_blocks/index.html.erb
@@ -6,25 +6,42 @@
 
 <h2 class="inline-block"><%= t("admin.site_customization.content_blocks.index.title") %></h2>
 
-<table class="cms-page-list">
-  <thead>
-    <tr>
-      <th><%= t("admin.site_customization.content_blocks.content_block.name") %></th>
-      <th><%= t("admin.site_customization.content_blocks.content_block.body") %></th>
-      <th><%= t("admin.actions.actions") %></th>
-    </tr>
-  </thead>
-  <tbody>
-  <% @content_blocks.each do |content_block| %>
-    <tr id="<%= dom_id(content_block) %>">
-      <td><%= link_to "#{content_block.name} (#{content_block.locale})", edit_admin_site_customization_content_block_path(content_block) %></td>
-      <td><%= content_block.body.html_safe %></td>
-      <td>
-        <%= button_to t("admin.site_customization.content_blocks.index.delete"),
-                      admin_site_customization_content_block_path(content_block),
-                      method: :delete, class: "button hollow alert" %>
-      </td>
-    </tr>
-  <% end %>
-  </tbody>
-</table>
+<h3><%= t("admin.site_customization.content_blocks.information") %></h3>
+
+<p><%= t("admin.site_customization.content_blocks.about") %></p>
+<p><%= t("admin.site_customization.content_blocks.top_links_html") %></p>
+
+<code>&lt;li&gt;&lt;a href=&quot;http://site1.com&quot;&gt;Site 1&lt;/a&gt;&lt;/li&gt;</code><br>
+<code>&lt;li&gt;&lt;a href=&quot;http://site2.com&quot;&gt;Site 2&lt;/a&gt;&lt;/li&gt;</code><br>
+<code>&lt;li&gt;&lt;a href=&quot;http://site3.com&quot;&gt;Site 3&lt;/a&gt;&lt;/li&gt;</code><br>
+
+<p class="margin-top"><%= t("admin.site_customization.content_blocks.footer_html") %></p>
+
+<% if @content_blocks.any? %>
+  <table class="cms-page-list">
+    <thead>
+      <tr>
+        <th><%= t("admin.site_customization.content_blocks.content_block.name") %></th>
+        <th><%= t("admin.site_customization.content_blocks.content_block.body") %></th>
+        <th><%= t("admin.actions.actions") %></th>
+      </tr>
+    </thead>
+    <tbody>
+    <% @content_blocks.each do |content_block| %>
+      <tr id="<%= dom_id(content_block) %>">
+        <td><%= link_to "#{content_block.name} (#{content_block.locale})", edit_admin_site_customization_content_block_path(content_block) %></td>
+        <td><%= content_block.body.html_safe %></td>
+        <td>
+          <%= button_to t("admin.site_customization.content_blocks.index.delete"),
+                        admin_site_customization_content_block_path(content_block),
+                        method: :delete, class: "button hollow alert" %>
+        </td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="callout primary">
+    <%= t("admin.site_customization.content_blocks.no_blocks") %>
+  </div>
+<% end %>
diff --git a/app/views/admin/tags/index.html.erb b/app/views/admin/tags/index.html.erb
index 55e51a8ac..57ca27ffd 100644
--- a/app/views/admin/tags/index.html.erb
+++ b/app/views/admin/tags/index.html.erb
@@ -1,4 +1,5 @@
 <h2><%= t("admin.tags.index.add_tag") %></h2>
+<p><%= t("admin.tags.index.help") %></p>
 
 <%= form_for(@tag, url: admin_tags_path, as: :tag) do |f| %>
   <div class="small-12 medium-6">
diff --git a/app/views/admin/valuators/index.html.erb b/app/views/admin/valuators/index.html.erb
index 03d3fb885..01e72a648 100644
--- a/app/views/admin/valuators/index.html.erb
+++ b/app/views/admin/valuators/index.html.erb
@@ -1,6 +1,6 @@
 <h2 class="inline-block"><%= t("admin.valuators.index.title") %></h2>
 
-<%= link_to t("admin.valuators.index.valuator_groups"), admin_valuator_groups_path, class: "button hollow float-right" %>
+<%= link_to t("admin.valuators.index.valuator_groups"), admin_valuator_groups_path, class: "button float-right" %>
 
 <%= render "admin/shared/user_search", url: search_admin_valuators_path %>
 
diff --git a/app/views/budgets/_phases.html.erb b/app/views/budgets/_phases.html.erb
index 2d11ef01f..a5461b6be 100644
--- a/app/views/budgets/_phases.html.erb
+++ b/app/views/budgets/_phases.html.erb
@@ -1,6 +1,6 @@
 <ul class="no-bullet budget-timeline">
   <% current_budget.published_phases.each do |phase| %>
-    <li class="phase <%= 'active' if phase == current_budget.current_phase %>">
+    <li class="phase <%= 'is-active' if phase == current_budget.current_phase %>">
       <h3><%= t("budgets.phase.#{phase.kind}") %></h3>
       <span>
         <%= l(phase.starts_at.to_date, format: :long) if phase.starts_at.present? %>
diff --git a/app/views/budgets/index.html.erb b/app/views/budgets/index.html.erb
index 2856dee3b..d698208c0 100644
--- a/app/views/budgets/index.html.erb
+++ b/app/views/budgets/index.html.erb
@@ -48,8 +48,7 @@
             <% end %>
           <% end %>
 
-
-        <% if current_budget.finished? || (current_budget.balloting? && can?(:read_results, current_budget)) %>
+        <% if current_budget.finished? %>
           <%= link_to t("budgets.show.see_results"),
                       budget_results_path(current_budget, heading_id: current_budget.headings.first),
                       class: "button margin-top expanded" %>
@@ -65,9 +64,9 @@
         <div id="groups_and_headings" class="groups-and-headings">
           <% current_budget.groups.each do |group| %>
             <h2 id="<%= group.name.parameterize %>"><%= group.name %></h2>
-            <ul class="no-bullet">
+            <ul class="no-bullet" data-equalizer data-equalizer-on="medium">
               <% group.headings.order_by_group_name.each do |heading| %>
-                <li class="heading small-12 medium-4 large-2">
+                <li class="heading small-12 medium-4 large-2" data-equalizer-watch>
                   <% unless current_budget.informing? %>
                     <%= link_to budget_investments_path(current_budget.id, heading_id: heading.id) do %>
                       <%= heading_name_and_price_html(heading, current_budget) %>
@@ -119,7 +118,7 @@
         <div class="small-12 medium-9 column">
           <ul class="no-bullet submenu">
             <li class="inline-block">
-              <%= link_to "#other_budgets", class: "active" do %>
+              <%= link_to "#other_budgets", class: "is-active" do %>
                 <h2>
                   <%= t("budgets.index.finished_budgets") %>
                 </h2>
@@ -137,6 +136,7 @@
                         <h3><%= budget.name %></h3>
                       </div>
                     </div>
+
                     <div class="small-12 medium-3 column table" data-equalizer-watch>
                       <div id="budget_<%= budget.id %>_results" class="table-cell align-middle">
                         <%= link_to t("budgets.index.see_results"),
diff --git a/app/views/budgets/investments/_categories.html.erb b/app/views/budgets/investments/_categories.html.erb
index 9432cb06c..b488536e5 100644
--- a/app/views/budgets/investments/_categories.html.erb
+++ b/app/views/budgets/investments/_categories.html.erb
@@ -5,7 +5,7 @@
 <ul id="categories" class="no-bullet categories">
   <% @categories.each do |category| %>
     <li class="inline-block">
-      <% css_class = { class: 'active' } if params[:search] == category.name %>
+      <% css_class = { class: 'is-active' } if params[:search] == category.name %>
       <%= link_to category.name, budget_investments_path(@budget, search: category.name), css_class || {} %>
     </li>
   <% end %>
diff --git a/app/views/budgets/investments/_filter_subnav.html.erb b/app/views/budgets/investments/_filter_subnav.html.erb
index a46c33b2d..048302b2e 100644
--- a/app/views/budgets/investments/_filter_subnav.html.erb
+++ b/app/views/budgets/investments/_filter_subnav.html.erb
@@ -1,22 +1,25 @@
-<div class="row">
-  <div class="small-12 column">
-    <ul class="tabs" data-tabs id="investments-tabs">
-      <li class="tabs-title is-active">
-        <%= link_to "#tab-comments" do %>
-          <h3>
-            <%= t("budgets.investments.show.comments_tab") %>
-            <span class="js-comments-count">(<%= @investment.comments_count %>)</span>
-          </h3>
-        <% end %>
-      </li>
-      <li class="tabs-title">
-        <%= link_to "#tab-milestones" do %>
-          <h3>
-            <%= t("budgets.investments.show.milestones_tab") %>
-            (<%= @investment.milestones.count %>)
-          </h3>
-        <% end %>
-      </li>
-    </ul>
-  </div>
-</div>
+<ul class="tabs"
+    id="investments_tabs"
+    role="tablist"
+    data-deep-link="true"
+    data-update-history="true"
+    data-deep-link-smudge="true"
+    data-deep-link-smudge-delay="500"
+    data-tabs>
+  <li class="tabs-title is-active">
+    <%= link_to "#tab-comments" do %>
+      <h3>
+        <%= t("budgets.investments.show.comments_tab") %>
+        <span class="js-comments-count">(<%= @investment.comments_count %>)</span>
+      </h3>
+    <% end %>
+  </li>
+  <li class="tabs-title">
+    <%= link_to "#tab-milestones" do %>
+      <h3>
+        <%= t("budgets.investments.show.milestones_tab") %>
+        (<%= @investment.milestones.count %>)
+      </h3>
+    <% end %>
+  </li>
+</ul>
diff --git a/app/views/budgets/investments/_investment_show.html.erb b/app/views/budgets/investments/_investment_show.html.erb
index bf9a5b727..0b0db9fa8 100644
--- a/app/views/budgets/investments/_investment_show.html.erb
+++ b/app/views/budgets/investments/_investment_show.html.erb
@@ -146,15 +146,15 @@
             <%= t("budgets.investments.show.project_not_selected_html") %>
           </div>
         <% end %>
-      <% end %>
-      <% if investment.should_show_price? %>
-        <div class="sidebar-divider"></div>
-        <h2><%= t("budgets.investments.show.price") %></h2>
-        <div class="supports text-center">
-          <p class="investment-project-amount">
-            <%= investment.formatted_price %>
-          </p>
-        </div>
+        <% if investment.should_show_price? %>
+          <div class="sidebar-divider"></div>
+          <h2><%= t("budgets.investments.show.price") %></h2>
+          <div class="supports text-center">
+            <p class="investment-project-amount">
+              <%= investment.formatted_price %>
+            </p>
+          </div>
+        <% end %>
       <% end %>
       <%= render partial: 'shared/social_share', locals: {
         share_title: t("budgets.investments.show.share"),
diff --git a/app/views/budgets/investments/_milestones.html.erb b/app/views/budgets/investments/_milestones.html.erb
index 60b52f46e..366d5d65a 100644
--- a/app/views/budgets/investments/_milestones.html.erb
+++ b/app/views/budgets/investments/_milestones.html.erb
@@ -1,4 +1,4 @@
-<div class="tabs-panel tab-milestones" id="tab-milestones">
+<div class="tabs-panel tab-milestones" id="tab-milestones" role="tab">
   <div class="row">
     <div class="small-12 column">
       <% if @investment.milestones.blank? %>
diff --git a/app/views/budgets/investments/show.html.erb b/app/views/budgets/investments/show.html.erb
index 264e7b102..3efb1f7d4 100644
--- a/app/views/budgets/investments/show.html.erb
+++ b/app/views/budgets/investments/show.html.erb
@@ -10,13 +10,18 @@
   ballot: @ballot
 } %>
 
-<div class="tabs-content" data-tabs-content="investments-tabs" role="tablist">
-  <%= render "budgets/investments/filter_subnav" %>
-  <%= render "budgets/investments/milestones" %>
+<div class="row">
+  <div class="small-12 column">
+    <%= render "budgets/investments/filter_subnav" %>
+  </div>
+</div>
 
-  <div class="tabs-panel is-active" id="tab-comments">
+<div class="tabs-content" data-tabs-content="investments_tabs" role="tablist">
+  <div class="tabs-panel is-active" id="tab-comments" role="tab">
     <%= render partial: '/comments/comment_tree', locals: { comment_tree: @comment_tree,
                                                             comment_flags: @comment_flags,
                                                             display_comments_count: false } %>
   </div>
+
+  <%= render "budgets/investments/milestones" %>
 </div>
diff --git a/app/views/budgets/results/show.html.erb b/app/views/budgets/results/show.html.erb
index 4699f9d8b..63308eaca 100644
--- a/app/views/budgets/results/show.html.erb
+++ b/app/views/budgets/results/show.html.erb
@@ -50,7 +50,7 @@
         <li>
           <%= link_to heading.name,
                       budget_results_path(@budget, heading_id: heading.to_param),
-                      class: heading.to_param == @heading.to_param ? 'active' : '' %>
+                      class: heading.to_param == @heading.to_param ? 'is-active' : '' %>
         </li>
       <% end %>
     </ul>
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index 8a0d7d34e..e5355b975 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= t('debates.index.title') %><% end %>
+<% provide :title do %><%= t("debates.index.title") %><% end %>
 <% content_for :header_addon do %>
   <%= render "shared/search_form",
              search_path: debates_path(page: 1),
@@ -54,10 +54,10 @@
 
       <%= render "shared/advanced_search", search_path: debates_path(page: 1) %>
 
-      <%= render 'shared/order_links', i18n_namespace: "debates.index" %>
+      <%= render "shared/order_links", i18n_namespace: "debates.index" %>
 
       <div class="show-for-small-only">
-        <%= link_to t("debates.index.start_debate"), new_debate_path, class: 'button expanded' %>
+        <%= link_to t("debates.index.start_debate"), new_debate_path, class: "button expanded" %>
       </div>
 
       <% if @debates.any? || current_user.blank? %>
@@ -81,7 +81,7 @@
           <p><%= t("debates.index.section_footer.description") %></p>
           <p><%= t("debates.index.section_footer.help_text_1") %></p>
           <p><%= t("debates.index.section_footer.help_text_2",
-                    org: link_to(setting['org_name'], new_user_registration_path)).html_safe %></p>
+                    org: link_to(setting["org_name"], new_user_registration_path)).html_safe %></p>
           <p><%= t("debates.index.section_footer.help_text_3",
                     proposal: link_to(t("debates.index.section_footer.proposals_link"), proposals_path),
                     budget: link_to(t("debates.index.section_footer.budget_link"), budgets_path)).html_safe %>
@@ -93,8 +93,8 @@
     <div class="small-12 medium-3 column">
 
       <aside class="margin-bottom">
-        <%= link_to t("debates.index.start_debate"), new_debate_path, class: 'button expanded' %>
-        <%= render "shared/tag_cloud", taggable: 'debate' %>
+        <%= link_to t("debates.index.start_debate"), new_debate_path, class: "button expanded" %>
+        <%= render "shared/tag_cloud", taggable: "debate" %>
       </aside>
     </div>
 
diff --git a/app/views/debates/new.html.erb b/app/views/debates/new.html.erb
index 97990048d..54a961d69 100644
--- a/app/views/debates/new.html.erb
+++ b/app/views/debates/new.html.erb
@@ -1,7 +1,7 @@
 <div class="debate-form row">
 
   <div class="small-12 medium-9 column">
-    <%= back_link_to %>
+    <%= back_link_to debates_path %>
 
     <h1><%= t("debates.new.start_new") %></h1>
     <div data-alert class="callout primary">
diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb
index 1e677045f..b3d8c3e5c 100644
--- a/app/views/layouts/_admin_header.html.erb
+++ b/app/views/layouts/_admin_header.html.erb
@@ -1,38 +1,39 @@
 <header class="header">
   <div class="top-links">
     <div class="expanded row">
-      <%= render 'shared/locale_switcher' %>
+      <%= render "shared/locale_switcher" %>
     </div>
   </div>
 
-  <div class="expanded row">
+  <div class="expanded row admin-top-bar">
+    <div class="title-bar" data-responsive-toggle="responsive_menu" data-hide-for="medium">
+      <button class="menu-icon" type="button" data-toggle="responsive_menu"></button>
+      <div class="title-bar-title"><%= t("application.menu")%></div>
+    </div>
+
     <div class="top-bar">
+      <div class="top-bar-left">
+        <ul class="menu">
+          <li class="menu-text">
+            <h1>
+              <%= link_to namespaced_root_path do %>
+                <%= setting["org_name"] %>
+                <br><small><%= namespaced_header_title %></small>
+              <% end %>
+            </h1>
+          </li>
+        </ul>
+      </div>
 
-      <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 class="top-bar-title">
-          <h1>
-            <%= link_to admin_root_path do %>
-              <%= setting['org_name'] %>
-              <br><small><%= namespaced_header_title %></small>
-            <% end %>
-          </h1>
-        </div>
-        <div id="responsive_menu">
-
+      <div id="responsive_menu">
         <div class="top-bar-right">
-          <ul class="menu" data-responsive-menu="medium-dropdown">
+          <ul class="dropdown menu" data-dropdown-menu>
             <%= render "admin/shared/admin_shortcuts" %>
             <%= render "shared/admin_login_items" %>
             <%= render "layouts/notification_item" %>
             <%= render "devise/menu/login_items" %>
           </ul>
         </div>
-
       </div>
     </div>
   </div>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index a73a99509..8b4c0a171 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -10,37 +10,53 @@
   </div>
 
   <div class="row">
+    <div class="title-bar" data-responsive-toggle="responsive_menu" data-hide-for="medium">
+      <button class="menu-icon" type="button" data-toggle="responsive_menu"></button>
+      <div class="title-bar-title"><%= t("application.menu")%></div>
+    </div>
+
     <div class="top-bar">
-
-      <%= 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 class="menu-icon dark" data-toggle></span>
-        <%= t("application.menu")%>
-      </span>
-
-      <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")) %>
-            <%= setting['org_name'] %>
+      <ul class="menu show-for-small-only">
+        <li class="menu-text">
+          <%= link_to root_path, accesskey: "0" do %>
+            <%= image_tag(image_path_for("logo_header.png"),
+                          class: "float-left",
+                          size: "48x48",
+                          alt: t("layouts.header.logo")) %>
+            <%= setting["org_name"] %>
           <% end %>
-        </div>
+        </li>
+      </ul>
+    </div>
 
-        <div class="top-bar-right">
-          <ul class="menu" data-responsive-menu="medium-dropdown">
-            <%= render "shared/admin_login_items" %>
-            <%= render "layouts/notification_item" %>
-            <%= render "devise/menu/login_items" %>
-          </ul>
+    <div class="top-bar" id="responsive_menu">
+      <div class="top-bar-left">
+        <ul class="menu">
+          <li class="menu-text">
+            <%= 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")) %>
+              <%= setting["org_name"] %>
+            <% end %>
+          </li>
+        </ul>
+      </div>
 
-          <div class="show-for-small-only">
-            <div class="subnavigation row">
-              <%= render "shared/subnavigation" %>
-              <div class="small-12 column">
-                <%= render "shared/top_links" %>
-              </div>
-            </div>
+      <div class="top-bar-right">
+        <ul class="dropdown menu" data-dropdown-menu>
+          <%= render "shared/admin_login_items" %>
+          <%= render "layouts/notification_item" %>
+          <%= render "devise/menu/login_items" %>
+        </ul>
+      </div>
+
+      <div class="show-for-small-only">
+        <div class="subnavigation row">
+          <%= render "shared/subnavigation" %>
+          <div class="small-12 column">
+            <%= render "shared/top_links" %>
           </div>
         </div>
       </div>
diff --git a/app/views/layouts/_mailer_footer.html.erb b/app/views/layouts/_mailer_footer.html.erb
new file mode 100644
index 000000000..b2a3ea388
--- /dev/null
+++ b/app/views/layouts/_mailer_footer.html.erb
@@ -0,0 +1,13 @@
+<table cellpadding="0" cellspacing="0" border="0" style="margin: 0 auto; max-width: 700px; width:100%; margin-bottom: 40px; padding: 0 20px;">
+  <tbody>
+    <tr>
+      <td style="text-align: center; border-top: 1px solid #dadfe1; padding-top: 20px;">
+        <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; margin: 0;padding: 0;line-height: 1.5em;color: #797f7f; font-size: 12px;">
+        <%= setting['org_name'] %></p>
+
+        <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; margin: 0;padding: 0;line-height: 1.5em;color: #222; font-size: 10px; margin-top: 12px;">
+        <%= t('mailers.no_reply') %></p>
+      </td>
+    </tr>
+  </tbody>
+</table>
diff --git a/app/views/layouts/_mailer_header.html.erb b/app/views/layouts/_mailer_header.html.erb
new file mode 100644
index 000000000..29fc798df
--- /dev/null
+++ b/app/views/layouts/_mailer_header.html.erb
@@ -0,0 +1,15 @@
+<table cellpadding="0" cellspacing="0" border="0" style="background: #fff; margin: 0 auto; max-width: 700px; width:100%;">
+  <tr>
+    <td>
+      <table cellpadding="0" cellspacing="0" border="0" style="width: 100%;">
+        <tr>
+          <td style="border-bottom: 1px solid #dadfe1; padding: 20px 0;">
+            <a href="#" target="_blank">
+              <%= image_tag('logo_email.png',  style: "border: 0; display: block; width: 100%;max-width: 370px", alt: setting['org_name']) %>
+            </a>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index f90b8e39d..9431845dd 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -7,38 +7,16 @@
 </head>
 <body style="background: #fff; font-family:font-family: 'Open Sans','Helvetica Neue',arial,sans-serif !important; margin: 0 10px; padding: 0; text-align: left;">
 
+  <%= render "layouts/mailer_header" %>
+
   <table cellpadding="0" cellspacing="0" border="0" style="background: #fff; margin: 0 auto; max-width: 700px; width:100%;">
-    <tr>
-      <td>
-        <table cellpadding="0" cellspacing="0" border="0" style="width: 100%;">
-          <tr>
-            <td style="border-bottom: 1px solid #dadfe1; padding: 20px 0;">
-              <a href="#" target="_blank">
-                <%= image_tag('logo_email.png',  style: "border: 0; display: block; width: 100%;max-width: 370px", alt: setting['org_name']) %>
-              </a>
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-    <tr>
-      <%= yield %>
-    </tr>
-  </table>
-
-  <table cellpadding="0" cellspacing="0" border="0" style="margin: 0 auto; max-width: 700px; width:100%; margin-bottom: 40px; padding: 0 20px;">
     <tbody>
-    <tr>
-      <td style="text-align: center; border-top: 1px solid #dadfe1; padding-top: 20px;">
-        <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; margin: 0;padding: 0;line-height: 1.5em;color: #797f7f; font-size: 12px;">
-        <%= setting['org_name'] %></p>
-
-        <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; margin: 0;padding: 0;line-height: 1.5em;color: #222; font-size: 10px; margin-top: 12px;">
-        <%= t('mailers.no_reply') %></p>
-
-      </td>
-    </tr>
+      <tr>
+        <%= yield %>
+      </tr>
     </tbody>
   </table>
+
+  <%= render "layouts/mailer_footer" %>
 </body>
 </html>
diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb
index 7b4a5f26d..ba1f9f909 100644
--- a/app/views/layouts/management.html.erb
+++ b/app/views/layouts/management.html.erb
@@ -18,23 +18,23 @@
     <header class="header">
       <div class="top-links">
         <div class="expanded row">
-          <%= render 'shared/locale_switcher' %>
+          <%= render "shared/locale_switcher" %>
         </div>
       </div>
 
-      <div class="expanded row">
+      <div class="expanded row admin-top-bar">
         <div class="top-bar">
-
-          <%= link_to setting['org_name'], management_root_path, class: "logo show-for-small-only" %>
-
-            <div class="top-bar-title">
-              <h1>
-                <%= link_to management_root_path do %>
-                  <%= setting['org_name'] %>
-                  <br><small><%= t("management.dashboard.index.title") %></small>
-                <% end %>
-              </h1>
-            </div>
+          <div class="top-bar-left">
+            <ul class="menu">
+              <li class="menu-text">
+                <h1>
+                  <%= link_to management_root_path do %>
+                    <%= setting["org_name"] %>
+                    <br><small><%= t("management.dashboard.index.title") %></small>
+                  <% end %>
+                </h1>
+              </li>
+            </ul>
           </div>
         </div>
       </div>
diff --git a/app/views/legislation/processes/_key_dates.html.erb b/app/views/legislation/processes/_key_dates.html.erb
index bf8961d86..dc74f8c59 100644
--- a/app/views/legislation/processes/_key_dates.html.erb
+++ b/app/views/legislation/processes/_key_dates.html.erb
@@ -6,7 +6,7 @@
 
         <ul>
           <% if process.debate_phase.enabled? %>
-            <li <%= 'class=active' if phase.to_sym == :debate_phase %>>
+            <li <%= 'class=is-active' if phase.to_sym == :debate_phase %>>
               <%= link_to debate_legislation_process_path(process) do %>
                 <h4><%= t('legislation.processes.shared.debate_dates') %></h4>
                 <p><%= format_date(process.debate_start_date) %> - <%= format_date(process.debate_end_date) %></p>
@@ -15,7 +15,7 @@
           <% end %>
 
           <% if process.proposals_phase.enabled? %>
-            <li <%= 'class=active' if phase.to_sym == :proposals_phase %>>
+            <li <%= 'class=is-active' if phase.to_sym == :proposals_phase %>>
               <%= link_to proposals_legislation_process_path(process) do %>
                 <h4><%= t('legislation.processes.shared.proposals_dates') %></h4>
                 <p><%= format_date(process.proposals_phase_start_date) %> - <%= format_date(process.proposals_phase_end_date) %></p>
@@ -24,7 +24,7 @@
           <% end %>
 
           <% if process.draft_publication.enabled? %>
-            <li <%= 'class=active' if phase.to_sym == :draft_publication %>>
+            <li <%= 'class=is-active' if phase.to_sym == :draft_publication %>>
               <%= link_to draft_publication_legislation_process_path(process) do %>
                 <h4><%= t('legislation.processes.shared.draft_publication_date') %></h4>
                 <p><%= format_date(process.draft_publication_date) %></p>
@@ -33,7 +33,7 @@
           <% end %>
 
           <% if process.allegations_phase.enabled? %>
-            <li <%= 'class=active' if phase.to_sym == :allegations_phase %>>
+            <li <%= 'class=is-active' if phase.to_sym == :allegations_phase %>>
               <%= link_to allegations_legislation_process_path(process) do %>
                 <h4><%= t('legislation.processes.shared.allegations_dates') %></h4>
                 <p><%= format_date(process.allegations_start_date) %> - <%= format_date(process.allegations_end_date) %></p>
@@ -42,7 +42,7 @@
           <% end %>
 
           <% if process.result_publication.enabled? %>
-            <li <%= 'class=active' if phase.to_sym == :result_publication %>>
+            <li <%= 'class=is-active' if phase.to_sym == :result_publication %>>
               <%= link_to result_publication_legislation_process_path(process) do %>
                 <h4><%= t('legislation.processes.shared.result_publication_date') %></h4>
                 <p><%= format_date(process.result_publication_date) %></p>
diff --git a/app/views/legislation/proposals/_categories.html.erb b/app/views/legislation/proposals/_categories.html.erb
index d0c34d23f..99ccea4be 100644
--- a/app/views/legislation/proposals/_categories.html.erb
+++ b/app/views/legislation/proposals/_categories.html.erb
@@ -5,7 +5,7 @@
 <ul id="categories" class="no-bullet categories">
   <% @process.tag_list_on(:customs).each do |tag| %>
     <li class="inline-block">
-      <% css_class = { class: 'active' } if params[:search] == tag %>
+      <% css_class = { class: 'is-active' } if params[:search] == tag %>
       <%= link_to tag,
                   legislation_process_proposals_path(process_id: @process, search: tag),
                   css_class || {} %>
diff --git a/app/views/legislation/proposals/_filter_subnav.html.erb b/app/views/legislation/proposals/_filter_subnav.html.erb
index 0250d36db..66a65fed7 100644
--- a/app/views/legislation/proposals/_filter_subnav.html.erb
+++ b/app/views/legislation/proposals/_filter_subnav.html.erb
@@ -1,14 +1,17 @@
-<div class="row">
-  <div class="small-12 column">
-    <ul class="tabs" data-tabs id="proposals-tabs">
-      <li class="tabs-title is-active">
-        <%= link_to "#tab-comments" do %>
-          <h3>
-            <%= t("proposals.show.comments_tab") %>
-            <span class="js-comments-count">(<%= @proposal.comments_count %>)</span>
-          </h3>
-        <% end %>
-      </li>
-    </ul>
-  </div>
-</div>
+<ul class="tabs"
+    id="legislation_proposals_tabs"
+    role="tablist"
+    data-deep-link="true"
+    data-update-history="true"
+    data-deep-link-smudge="true"
+    data-deep-link-smudge-delay="500"
+    data-tabs>
+  <li class="tabs-title is-active">
+    <%= link_to "#tab-comments" do %>
+      <h3>
+        <%= t("proposals.show.comments_tab") %>
+        <span class="js-comments-count">(<%= @proposal.comments_count %>)</span>
+      </h3>
+    <% end %>
+  </li>
+</ul>
diff --git a/app/views/legislation/proposals/_notifications.html.erb b/app/views/legislation/proposals/_notifications.html.erb
index 69389b2c5..6a693c601 100644
--- a/app/views/legislation/proposals/_notifications.html.erb
+++ b/app/views/legislation/proposals/_notifications.html.erb
@@ -1,4 +1,4 @@
-<div class="tabs-panel" id="tab-notifications">
+<div class="tabs-panel" id="tab-notifications" role="tab">
   <div class="row">
     <div class="small-12 column">
       <% if @notifications.blank? %>
diff --git a/app/views/legislation/proposals/show.html.erb b/app/views/legislation/proposals/show.html.erb
index 1867644ca..4f7b08fe7 100644
--- a/app/views/legislation/proposals/show.html.erb
+++ b/app/views/legislation/proposals/show.html.erb
@@ -113,10 +113,14 @@
   </div>
 <% end %>
 
-<div class="tabs-content" data-tabs-content="proposals-tabs" role="tablist">
-  <%= render "legislation/proposals/filter_subnav" %>
+<div class="row">
+  <div class="small-12 column">
+    <%= render "legislation/proposals/filter_subnav" %>
+  </div>
+</div>
 
-  <div class="tabs-panel is-active" id="tab-comments">
+<div class="tabs-content" data-tabs-content="legislation_proposals_tabs" role="tablist">
+  <div class="tabs-panel is-active" id="tab-comments" role="tab">
     <%= render "legislation/proposals/comments" %>
   </div>
 </div>
diff --git a/app/views/legislation/questions/_answer_form.html.erb b/app/views/legislation/questions/_answer_form.html.erb
index fd379b845..096bf9627 100644
--- a/app/views/legislation/questions/_answer_form.html.erb
+++ b/app/views/legislation/questions/_answer_form.html.erb
@@ -3,7 +3,7 @@
 
     <%= form_for answer, url: legislation_process_question_answers_path(process, question, answer), remote: true , html: { class: "controls-stacked"} do |f| %>
       <% question.question_options.each do |question_option| %>
-        <label class="control radio <%= 'active' if @answer.legislation_question_option_id == question_option.id %>">
+        <label class="control radio <%= 'is-active' if @answer.legislation_question_option_id == question_option.id %>">
           <%= f.radio_button :legislation_question_option_id, question_option.id, label: false %>
           <span class="control-indicator"></span>
           <%= question_option.value %>
@@ -16,7 +16,7 @@
 
     <form class="controls-stacked disabled">
       <% question.question_options.each do |question_option| %>
-        <label class="control radio <%= 'active' if answer.persisted? && (answer.legislation_question_option_id == question_option.id) %>">
+        <label class="control radio <%= 'is-active' if answer.persisted? && (answer.legislation_question_option_id == question_option.id) %>">
           <input id="quiz-1" name="radio" type="radio" disabled="true">
           <span class="control-indicator"></span>
           <%= question_option.value %>
diff --git a/app/views/management/_menu.html.erb b/app/views/management/_menu.html.erb
index 75e832a24..9aac8d9a0 100644
--- a/app/views/management/_menu.html.erb
+++ b/app/views/management/_menu.html.erb
@@ -1,6 +1,6 @@
 <div class="admin-sidebar">
   <ul id="admin_menu" data-accordion-menu data-multi-open="false">
-    <li <%= "class=active" if controller_name == "document_verifications" ||
+    <li <%= "class=is-active" if controller_name == "document_verifications" ||
                               controller_name == "email_verifications" ||
                               controller_name == "users" %>>
       <%= link_to management_document_verifications_path do %>
@@ -26,28 +26,28 @@
       </ul>
     </li>
 
-    <li <%= "class=active" if controller_name == "proposals" && action_name == "new" %>>
+    <li <%= "class=is-active" if controller_name == "proposals" && action_name == "new" %>>
       <%= link_to new_management_proposal_path do %>
         <span class="icon-proposals"></span>
         <%= t("management.menu.create_proposal") %>
       <% end %>
     </li>
 
-    <li <%= "class=active" if controller_name == "proposals" && action_name == "index"  %>>
+    <li <%= "class=is-active" if controller_name == "proposals" && action_name == "index"  %>>
       <%= link_to management_proposals_path do %>
         <span class="icon-like"></span>
         <%= t("management.menu.support_proposals") %>
       <% end %>
     </li>
 
-    <li <%= "class=active" if controller_name == "spending_proposals" && action_name == "new" %>>
+    <li <%= "class=is-active" if controller_name == "spending_proposals" && action_name == "new" %>>
       <%= link_to new_management_spending_proposal_path do %>
         <span class="icon-budget"></span>
         <%= t("management.menu.create_spending_proposal") %>
       <% end %>
     </li>
 
-    <li <%= "class=active" if controller_name == "spending_proposals" && action_name == "index" %>>
+    <li <%= "class=is-active" if controller_name == "spending_proposals" && action_name == "index" %>>
       <%= link_to management_spending_proposals_path do %>
         <span class="icon-like"></span>
         <%= t("management.menu.support_spending_proposals") %>
@@ -55,7 +55,7 @@
     </li>
 
     <% if Setting['feature.budgets'] %>
-      <li <%= "class=active" if (controller_name == "budget_investments" && action_name == "new") ||
+      <li <%= "class=is-active" if (controller_name == "budget_investments" && action_name == "new") ||
                                 (controller_name == "budget" && action_name == 'create_investments') %>>
         <%= link_to create_investments_management_budgets_path do %>
           <span class="icon-budget"></span>
@@ -63,7 +63,7 @@
         <% end %>
       </li>
 
-      <li <%= "class=active" if (controller_name == "budget_investments" && action_name == "index") ||
+      <li <%= "class=is-active" if (controller_name == "budget_investments" && action_name == "index") ||
                                 (controller_name == "budget" && action_name == "support_investments")%>>
         <%= link_to support_investments_management_budgets_path do %>
           <span class="icon-like"></span>
@@ -71,7 +71,7 @@
         <% end %>
       </li>
 
-        <li <%= "class=active" if (controller_name == "budget_investments" && action_name == "print") ||
+        <li <%= "class=is-active" if (controller_name == "budget_investments" && action_name == "print") ||
             (controller_name == "budgets" && action_name == "print_investments") %>>
           <%= link_to print_investments_management_budgets_path do %>
               <span class="icon-print"></span>
@@ -80,14 +80,14 @@
         </li>
     <% end %>
 
-    <li <%= "class=active" if controller_name == "proposals" && action_name == "print" %>>
+    <li <%= "class=is-active" if controller_name == "proposals" && action_name == "print" %>>
       <%= link_to print_management_proposals_path do %>
         <span class="icon-print"></span>
         <%= t("management.menu.print_proposals") %>
       <% end %>
     </li>
 
-    <li <%= "class=active" if controller_name == "spending_proposals" && action_name == "print" %>>
+    <li <%= "class=is-active" if controller_name == "spending_proposals" && action_name == "print" %>>
       <%= link_to print_management_spending_proposals_path do %>
         <span class="icon-print"></span>
         <%= t("management.menu.print_spending_proposals") %>
diff --git a/app/views/moderation/_menu.html.erb b/app/views/moderation/_menu.html.erb
index d9aa8ddcd..44232ce2c 100644
--- a/app/views/moderation/_menu.html.erb
+++ b/app/views/moderation/_menu.html.erb
@@ -5,7 +5,7 @@
     </li>
 
     <% if feature?(:proposals) %>
-      <li <%= "class=active" if controller_name == "proposals" %>>
+      <li <%= "class=is-active" if controller_name == "proposals" %>>
         <%= link_to moderation_proposals_path do %>
           <span class="icon-proposals"></span>
           <%= t("moderation.menu.proposals") %>
@@ -14,7 +14,7 @@
     <% end %>
 
     <% if feature?(:debates) %>
-      <li <%= "class=active" if controller_name == "debates" %>>
+      <li <%= "class=is-active" if controller_name == "debates" %>>
         <%= link_to moderation_debates_path do %>
           <span class="icon-debates"></span>
           <%= t('moderation.menu.flagged_debates') %>
@@ -22,14 +22,14 @@
       </li>
     <% end %>
 
-    <li <%= "class=active" if controller_name == "comments" %>>
+    <li <%= "class=is-active" if controller_name == "comments" %>>
       <%= link_to moderation_comments_path do %>
         <span class="icon-comments"></span>
         <%= t("moderation.menu.flagged_comments") %>
       <% end %>
     </li>
 
-    <li <%= "class=active" if controller_name == "users" %>>
+    <li <%= "class=is-active" if controller_name == "users" %>>
       <%= link_to moderation_users_path do %>
         <span class="icon-user"></span>
         <%= t("moderation.menu.users") %>
diff --git a/app/views/moderation/dashboard/index.html.erb b/app/views/moderation/dashboard/index.html.erb
index d621f7555..489a0e320 100644
--- a/app/views/moderation/dashboard/index.html.erb
+++ b/app/views/moderation/dashboard/index.html.erb
@@ -1,42 +1,3 @@
 <%= link_to t("admin.dashboard.index.back", org: setting['org_name']), root_path, class: "button float-right" %>
 
 <h2 class="inline-block"><%= t("moderation.dashboard.index.title") %></h2>
-
-<p>Desde aquí puedes moderar el sistema, a través de las siguientes acciones:<p>
-
-<div class="small-12 medium-9">
-  <ul class="accordion" data-accordion data-multi-expand="true" data-allow-all-closed="true">
-
-    <li class="accordion-item" data-accordion-item>
-      <a href="#" class="accordion-title">Propuestas / Debates / Comentarios</a>
-      <div class="accordion-content" data-tab-content>
-        <p>Cuando un usuario marca en una Propuesta/Debate/Comentario la opción de "denunciar como inapropiado", aparecerá en esta lista. Respecto a cada uno aparecerá el <em>título, fecha, número de denuncias</em> (cuántos usuarios diferentes han marcado la opción de denuncia) y el <em>texto de la Propuesta/Debate/Comentario</em>.</p>
-
-        <p>A la derecha de cada elemento aparece una caja que podemos marcar para seleccionar todos los que queramos de la lista. Una vez seleccionados uno o varios, encontramos al final de la página <strong>tres botones para realizar acciones</strong> sobre ellos:</p>
-
-        <ul>
-          <li><strong>Ocultar</strong>: hará que esos elementos dejen de mostrarse en la web.</li>
-          <li><strong>Bloquear autores</strong>: hará que el autor de ese elemento deje de poder acceder a la web, y que además todos las Propuestas/Debates/Comentarios de ese usuario dejen de mostrarse en la web.</li>
-          <li><strong>Marcar como revisados</strong> cuando consideramos que esos elementos no deben ser moderados, que su contenido es correcto, y que por lo tanto deben dejar de ser mostrados en esta lista de elementos inapropiados.</li>
-        </ul>
-
-        <p>Para facilitar la gestión, arriba encontramos un <strong>filtro</strong> con las secciones:</p>
-
-        <ul>
-          <li><strong>Pendientes</strong>: las Propuestas/Debates/Comentarios sobre los que todavía no se ha pulsado "ocultar", "bloquear" o "marcar como revisados", y que por lo tanto deberían ser revisados todavía</li>
-          <li><strong>Todos</strong>: mostrando todos las Propuestas/Debates/Comentarios de la web, y no sólo los marcados como inapropiados.</li>
-          <li><strong>Marcados como revisados</strong>: los que algún moderador ha marcado como revisados y por lo tanto parecen correctos.</li>
-        </ul>
-
-        <p><em>Es recomendable revisar regularmente la sección "pendientes".</em></p>
-      </div>
-    </li>
-
-    <li class="accordion-item" data-accordion-item>
-      <a href="#" class="accordion-title">Bloquear usuarios</a>
-      <div class="accordion-content" data-tab-content>
-        <p>Un buscador nos permite encontrar cualquier usuario introduciendo su <em>nombre de usuario o correo electrónico</em>, y bloquearlo una vez encontrado. Al bloquearlo, <strong>el usuario no podrá volver a acceder a la web</strong>, y todas sus Propuestas/Debates/Comentarios serán ocultados y dejarán de ser visibles en la web.</p>
-      </div>
-    </li>
-  </ul>
-</div>
diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb
index 132c9e15e..eccd3ec6a 100644
--- a/app/views/notifications/index.html.erb
+++ b/app/views/notifications/index.html.erb
@@ -10,7 +10,7 @@
             class: "button hollow float-right-medium" %>
 
     <ul class="menu simple clear">
-      <li class="active">
+      <li class="is-active">
         <h2><%= link_to t("notifications.index.unread"), notifications_path %></h2>
       </li>
       <li>
diff --git a/app/views/notifications/read.html.erb b/app/views/notifications/read.html.erb
index ec4d32c42..f5a2b68ae 100644
--- a/app/views/notifications/read.html.erb
+++ b/app/views/notifications/read.html.erb
@@ -7,7 +7,7 @@
       <li>
         <%= link_to t("notifications.index.unread"), notifications_path %>
       </li>
-      <li class="active">
+      <li class="is-active">
         <h2><%= link_to t("notifications.index.read"), read_notifications_path %></h2>
       </li>
     </ul>
diff --git a/app/views/officing/_menu.html.erb b/app/views/officing/_menu.html.erb
index c96fd8c07..e954d2195 100644
--- a/app/views/officing/_menu.html.erb
+++ b/app/views/officing/_menu.html.erb
@@ -1,14 +1,14 @@
 <div class="admin-sidebar" data-equalizer-watch>
   <ul id="officing_menu">
 
-    <li <%= "class=active" if controller_name == "voters" %>>
+    <li <%= "class=is-active" if controller_name == "voters" %>>
       <%= link_to new_officing_residence_path do %>
         <span class="icon-user"></span>
         <%= t("officing.menu.voters") %>
       <% end %>
     </li>
 
-    <li <%= "class=active" if ["results"].include?(controller_name) || (controller_name == "polls" && action_name == "final") %>>
+    <li <%= "class=is-active" if ["results"].include?(controller_name) || (controller_name == "polls" && action_name == "final") %>>
       <%= link_to final_officing_polls_path do %>
         <span class="icon-user"></span>
         <%= t("officing.menu.total_recounts") %>
diff --git a/app/views/polls/_gallery.html.erb b/app/views/polls/_gallery.html.erb
index 839d2ef4e..9082e8901 100644
--- a/app/views/polls/_gallery.html.erb
+++ b/app/views/polls/_gallery.html.erb
@@ -17,7 +17,7 @@
     </li>
 
     <% answer.images.reverse.each_with_index do |image, index| %>
-      <li class="orbit-slide <%= active_class(index) %>">
+      <li class="orbit-slide <%= is_active_class(index) %>">
         <%= link_to image.attachment.url(:original), target: "_blank" do %>
           <%= image_tag image.attachment.url(:original),
                         class: "orbit-image",
@@ -31,7 +31,7 @@
 
   <nav class="orbit-bullets">
     <% answer.images.each_with_index do |image, index| %>
-      <button class="<%= active_class(index) %>" data-slide="<%= index %>">
+      <button class="<%= is_active_class(index) %>" data-slide="<%= index %>">
         <span class="show-for-sr"><%= image.title.unicode_normalize %></span>
       </button>
     <% end %>
diff --git a/app/views/polls/_poll_subnav.html.erb b/app/views/polls/_poll_subnav.html.erb
index 112f267ee..94d522dab 100644
--- a/app/views/polls/_poll_subnav.html.erb
+++ b/app/views/polls/_poll_subnav.html.erb
@@ -5,7 +5,7 @@
       <ul class="menu simple clear">
         <% if current_user && current_user.administrator? || @poll.results_enabled? %>
           <% if controller_name == "polls" && action_name == "results" %>
-            <li class="active">
+            <li class="is-active">
               <h2><%= t("polls.show.results_menu") %></h2>
             </li>
           <% else %>
@@ -15,7 +15,7 @@
 
         <% if current_user && current_user.administrator? || @poll.stats_enabled? %>
           <% if controller_name == "polls" && action_name == "stats" %>
-            <li class="active">
+            <li class="is-active">
               <h2><%= t("polls.show.stats_menu") %></h2>
             </li>
           <% else %>
@@ -24,7 +24,7 @@
         <% end %>
 
         <% if controller_name == "polls" && action_name == "show" %>
-          <li class="active">
+          <li class="is-active">
             <h2><%= t("polls.show.info_menu") %></h2>
           </li>
         <% else %>
diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb
index 709fcc2a2..7a2730a8d 100644
--- a/app/views/polls/show.html.erb
+++ b/app/views/polls/show.html.erb
@@ -127,7 +127,7 @@
   <div class="tabs-content" data-tabs-content="polls_tabs" role="tablist">
     <%= render "filter_subnav" %>
 
-    <div class="tabs-panel is-active" id="tab-comments">
+    <div class="tabs-panel is-active" id="tab-comments" role="tab">
       <%= render "comments" %>
     </div>
   </div>
diff --git a/app/views/proposals/_categories.html.erb b/app/views/proposals/_categories.html.erb
index a694eb555..6e12096e4 100644
--- a/app/views/proposals/_categories.html.erb
+++ b/app/views/proposals/_categories.html.erb
@@ -5,7 +5,7 @@
 <ul id="categories" class="no-bullet categories">
   <% @categories.each do |category| %>
     <li class="inline-block">
-      <% css_class = { class: 'active' } if params[:search] == category.name %>
+      <% css_class = { class: 'is-active' } if params[:search] == category.name %>
       <%= link_to category.name, proposals_path(search: category.name), css_class || {} %>
     </li>
   <% end %>
diff --git a/app/views/proposals/_filter_subnav.html.erb b/app/views/proposals/_filter_subnav.html.erb
index 6347d56b0..2132be6e5 100644
--- a/app/views/proposals/_filter_subnav.html.erb
+++ b/app/views/proposals/_filter_subnav.html.erb
@@ -1,22 +1,25 @@
-<div class="row">
-  <div class="small-12 column">
-    <ul class="tabs" data-tabs id="proposals-tabs">
-      <li class="tabs-title is-active">
-        <%= link_to "#tab-comments" do %>
-          <h3>
-            <%= t("proposals.show.comments_tab") %>
-            <span class="js-comments-count">(<%= @proposal.comments_count %>)</span>
-          </h3>
-        <% end %>
-      </li>
-      <li class="tabs-title">
-      <%= link_to "#tab-notifications" do %>
-        <h3>
-          <%= t("proposals.show.notifications_tab") %>
-          (<%= @notifications.count %>)
-        </h3>
-      <% end %>
-      </li>
-    </ul>
-  </div>
-</div>
+<ul class="tabs"
+    id="proposals_tabs"
+    role="tablist"
+    data-deep-link="true"
+    data-update-history="true"
+    data-deep-link-smudge="true"
+    data-deep-link-smudge-delay="500"
+    data-tabs>
+  <li class="tabs-title is-active">
+    <%= link_to "#tab-comments" do %>
+      <h3>
+        <%= t("proposals.show.comments_tab") %>
+        <span class="js-comments-count">(<%= @proposal.comments_count %>)</span>
+      </h3>
+    <% end %>
+  </li>
+  <li class="tabs-title">
+    <%= link_to "#tab-notifications" do %>
+      <h3>
+        <%= t("proposals.show.notifications_tab") %>
+        (<%= @notifications.count %>)
+      </h3>
+    <% end %>
+  </li>
+</ul>
diff --git a/app/views/proposals/_notifications.html.erb b/app/views/proposals/_notifications.html.erb
index 69389b2c5..6a693c601 100644
--- a/app/views/proposals/_notifications.html.erb
+++ b/app/views/proposals/_notifications.html.erb
@@ -1,4 +1,4 @@
-<div class="tabs-panel" id="tab-notifications">
+<div class="tabs-panel" id="tab-notifications" role="tab">
   <div class="row">
     <div class="small-12 column">
       <% if @notifications.blank? %>
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index 3fdd52937..36e35920c 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -1,18 +1,22 @@
 <% provide :title do %><%= @proposal.title %><% end %>
 <% content_for :meta_description do %><%= @proposal.summary %><% end %>
 <% provide :social_media_meta_tags do %>
-<%= render "shared/social_media_meta_tags",
-            social_url: proposal_url(@proposal),
-            social_title: @proposal.title,
-            social_description: @proposal.summary,
-            twitter_image_url: (@proposal.image.present? ? @proposal.image_url(:thumb) : nil),
-            og_image_url: (@proposal.image.present? ? @proposal.image_url(:thumb) : nil) %>
+  <%= render "shared/social_media_meta_tags",
+              social_url: proposal_url(@proposal),
+              social_title: @proposal.title,
+              social_description: @proposal.summary,
+              twitter_image_url: (@proposal.image.present? ? @proposal.image_url(:thumb) : nil),
+              og_image_url: (@proposal.image.present? ? @proposal.image_url(:thumb) : nil) %>
 <% end %>
 <% content_for :canonical do %>
   <%= render "shared/canonical", href: proposal_url(@proposal) %>
 <% end %>
 
-<% cache [locale_and_user_status(@proposal), @proposal, @proposal.author, Flag.flagged?(current_user, @proposal), @proposal_votes] do %>
+<% cache [locale_and_user_status(@proposal),
+          @proposal,
+          @proposal.author,
+          Flag.flagged?(current_user, @proposal),
+          @proposal_votes] do %>
   <div class="proposal-show">
     <div id="<%= dom_id(@proposal) %>" class="row">
       <div class="small-12 medium-9 column">
@@ -23,7 +27,8 @@
           <div data-alert class="callout alert margin-top proposal-retired">
             <strong>
               <%= t("proposals.show.retired_warning") %><br>
-              <%= link_to t("proposals.show.retired_warning_link_to_explanation"), "#retired_explanation" %>
+              <%= link_to t("proposals.show.retired_warning_link_to_explanation"),
+                          "#retired_explanation" %>
             </strong>
           </div>
         <% elsif @proposal.conflictive? %>
@@ -101,7 +106,10 @@
 
         <% if @proposal.retired? %>
           <div id="retired_explanation" class="callout">
-            <h2><%= t('proposals.show.retired') %>: <%= t("proposals.retire_options.#{@proposal.retired_reason}") unless @proposal.retired_reason == 'other' %></h2>
+            <h2>
+              <%= t("proposals.show.retired") %>:
+              <%= t("proposals.retire_options.#{@proposal.retired_reason}") unless @proposal.retired_reason == 'other' %>
+            </h2>
             <%= simple_format text_with_links(@proposal.retired_explanation), {}, sanitize: false %>
           </div>
         <% end %>
@@ -206,11 +214,20 @@
   </div>
 <% end %>
 
-<div class="tabs-content" data-tabs-content="proposals-tabs" role="tablist">
-  <%= render "proposals/filter_subnav" %>
-  <%= render "proposals/notifications" %>
-
-  <div class="tabs-panel is-active" id="tab-comments">
-    <%= render "proposals/comments" %>
+<div class="additional-content">
+  <div class="filter-subnav">
+    <div class="row">
+      <div class="small-12 column">
+        <%= render "proposals/filter_subnav" %>
+      </div>
+    </div>
   </div>
 </div>
+
+<div class="tabs-content" data-tabs-content="proposals_tabs" role="tablist">
+  <div class="tabs-panel is-active" id="tab-comments" role="tab">
+    <%= render "proposals/comments" %>
+  </div>
+
+  <%= render "proposals/notifications" %>
+</div>
diff --git a/app/views/shared/_admin_login_items.html.erb b/app/views/shared/_admin_login_items.html.erb
index a9e6fa4b9..3fbb34fcc 100644
--- a/app/views/shared/_admin_login_items.html.erb
+++ b/app/views/shared/_admin_login_items.html.erb
@@ -1,7 +1,7 @@
 <% if show_admin_menu? %>
-  <li>
+  <li class="has-submenu">
     <%= link_to t("layouts.header.administration_menu"), "#", rel: "nofollow", class: "hide-for-small-only" %>
-    <ul class="menu">
+    <ul class="submenu menu vertical" data-submenu>
       <% if current_user.administrator? %>
         <li>
           <%= link_to t("layouts.header.administration"), admin_root_path %>
diff --git a/app/views/shared/_filter_subnav.html.erb b/app/views/shared/_filter_subnav.html.erb
index 5a7e4d9d5..66d5ac273 100644
--- a/app/views/shared/_filter_subnav.html.erb
+++ b/app/views/shared/_filter_subnav.html.erb
@@ -3,7 +3,7 @@
 
   <% @valid_filters.each do |filter| %>
     <% if @current_filter == filter %>
-      <li class="active"><h2><%= t("#{i18n_namespace}.filters.#{filter}") %></h2></li>
+      <li class="is-active"><h2><%= t("#{i18n_namespace}.filters.#{filter}") %></h2></li>
     <% else %>
       <li><%= link_to t("#{i18n_namespace}.filters.#{filter}"),
         current_path_with_query_params(filter: filter, page: 1) %></li>
diff --git a/app/views/shared/_filter_subnav_vertical.html.erb b/app/views/shared/_filter_subnav_vertical.html.erb
index 7192dbd80..e1af05ef5 100644
--- a/app/views/shared/_filter_subnav_vertical.html.erb
+++ b/app/views/shared/_filter_subnav_vertical.html.erb
@@ -3,7 +3,7 @@
 
   <% @valid_filters.each do |filter| %>
     <% if @current_filter == filter %>
-      <li class="active">
+      <li class="is-active">
         <h2><%= t("#{i18n_namespace}.filters.#{filter}") %></h2>
       </li>
     <% else %>
diff --git a/app/views/shared/_order_links.html.erb b/app/views/shared/_order_links.html.erb
index 22081bcdc..231cbc657 100644
--- a/app/views/shared/_order_links.html.erb
+++ b/app/views/shared/_order_links.html.erb
@@ -1,7 +1,7 @@
 <ul class="no-bullet submenu">
   <% @valid_orders.each do |order| %>
     <li class="inline-block">
-      <%= link_to current_path_with_query_params(order: order, page: 1), class: order == @current_order ? 'active' : '' do %>
+      <%= link_to current_path_with_query_params(order: order, page: 1), class: order == @current_order ? 'is-active' : '' do %>
         <%= content_tag(order == @current_order ? :h2 : :span) do %>
           <%= t("#{i18n_namespace}.orders.#{order}") %>
         <% end %>
diff --git a/app/views/shared/_subnavigation.html.erb b/app/views/shared/_subnavigation.html.erb
index 4c9b79580..7a942f13a 100644
--- a/app/views/shared/_subnavigation.html.erb
+++ b/app/views/shared/_subnavigation.html.erb
@@ -32,7 +32,7 @@
         <%= layout_menu_link_to t("layouts.header.collaborative_legislation"),
                                 legislation_processes_path,
                                 controller.class.parent == Legislation,
-                                accesskey: "l" %>
+                                accesskey: "4" %>
       </li>
     <% end %>
     <% if feature?(:spending_proposals) %>
@@ -48,15 +48,15 @@
         <%= layout_menu_link_to t("layouts.header.budgets"),
                                   budgets_path,
                                   controller_name == "budgets" || controller_name == "investments",
-                                  accesskey: "4",
+                                  accesskey: "5",
                                   title: t("shared.go_to_page") + t("layouts.header.budgets") %>
       </li>
     <% end %>
     <li>
       <%= link_to t("layouts.header.help"),
                     help_path,
-                    accesskey: "5",
-                    class: ("active" if current_page?(help_path)),
+                    accesskey: "6",
+                    class: ("is-active" if current_page?(help_path)),
                     title: t("shared.go_to_page") + t("layouts.header.help") %>
     </li>
   </ul>
diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
index 30e6ad44a..4f2660840 100644
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -40,7 +40,7 @@
 
   <div class="tabs-content" data-tabs-content="topics-tabs" role="tablist">
     <%= render "topics/filter_subnav" %>
-    <div class="tabs-panel is-active" id="tab-comments">
+    <div class="tabs-panel is-active" id="tab-comments" role="tab">
       <%= render "topics/comments" %>
     </div>
   </div>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index a4f739a28..3319ebbd3 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -27,7 +27,7 @@
           <% @valid_filters.each do |filter| %>
             <% if @activity_counts[filter] > 0 %>
               <% if @current_filter == filter %>
-                <li class="active">
+                <li class="is-active">
                   <h2><%= t("users.show.filters.#{filter}", count: @activity_counts[filter]) %></h2>
                 </li>
               <% else %>
diff --git a/app/views/valuation/_menu.html.erb b/app/views/valuation/_menu.html.erb
index 3908b9279..c8ff25700 100644
--- a/app/views/valuation/_menu.html.erb
+++ b/app/views/valuation/_menu.html.erb
@@ -5,7 +5,7 @@
     </li>
 
     <% if feature?(:spending_proposals) %>
-      <li <%= "class=active" if controller_name == "spending_proposals" %>>
+      <li <%= "class=is-active" if controller_name == "spending_proposals" %>>
         <%= link_to valuation_spending_proposals_path do %>
           <span class="icon-budget"></span>
           <%= t("valuation.menu.spending_proposals") %>
@@ -14,7 +14,7 @@
     <% end %>
 
     <% if feature?(:budgets) %>
-      <li <%= "class=active" if controller_name == "budget_investments" %>>
+      <li <%= "class=is-active" if controller_name == "budget_investments" %>>
         <%= link_to valuation_budgets_path do %>
           <span class="icon-budget"></span>
           <%= t("valuation.menu.budgets") %>
diff --git a/app/views/valuation/budget_investments/index.html.erb b/app/views/valuation/budget_investments/index.html.erb
index 361ead7fb..20bdf95cb 100644
--- a/app/views/valuation/budget_investments/index.html.erb
+++ b/app/views/valuation/budget_investments/index.html.erb
@@ -8,7 +8,7 @@
     <div class="small-12 medium-4 column select-heading">
       <% slice.each do |filter| %>
         <%= link_to valuation_budget_budget_investments_path(budget_id: @budget.id, heading_id: filter[:id]),
-                    class: "#{'active' if params[:heading_id].to_s == filter[:id].to_s}" do %>
+                    class: "#{'is-active' if params[:heading_id].to_s == filter[:id].to_s}" do %>
           <%= filter[:name] %> (<%= filter[:count] %>)
         <% end %>
       <% end %>
diff --git a/app/views/valuation/spending_proposals/index.html.erb b/app/views/valuation/spending_proposals/index.html.erb
index 8536ec424..25b967121 100644
--- a/app/views/valuation/spending_proposals/index.html.erb
+++ b/app/views/valuation/spending_proposals/index.html.erb
@@ -5,7 +5,7 @@
     <div class="small-12 medium-4 column select-geozone">
       <% slice.each do |filter| %>
         <%= link_to valuation_spending_proposals_path(geozone_id: filter[:id]),
-                    class: "#{'active' if params[:geozone_id].to_s == filter[:id].to_s}" do %>
+                    class: "#{'is-active' if params[:geozone_id].to_s == filter[:id].to_s}" do %>
           <%= filter[:name] %>&nbsp;(<%= filter[:pending_count] %>)
         <% end %>
       <% end %>
diff --git a/app/views/verification/letter/new.html.erb b/app/views/verification/letter/new.html.erb
index e0f696171..0909ebf46 100644
--- a/app/views/verification/letter/new.html.erb
+++ b/app/views/verification/letter/new.html.erb
@@ -9,7 +9,7 @@
       <div class="small-4 column verification-step completed">
         <span class="number">2</span> <%= t("verification.step_2") %>
       </div>
-      <div class="small-4 column verification-step active">
+      <div class="small-4 column verification-step is-active">
         <span class="number">3</span> <%= t("verification.step_3") %>
       </div>
 
diff --git a/app/views/verification/residence/new.html.erb b/app/views/verification/residence/new.html.erb
index 95497b87b..7c2910581 100644
--- a/app/views/verification/residence/new.html.erb
+++ b/app/views/verification/residence/new.html.erb
@@ -3,7 +3,7 @@
   <div class="small-12 column">
 
     <div class="text-center">
-      <div class="small-4 column verification-step active">
+      <div class="small-4 column verification-step is-active">
         <span class="number">1</span> <%= t("verification.step_1") %>
       </div>
       <div class="small-4 column verification-step">
diff --git a/app/views/verification/sms/edit.html.erb b/app/views/verification/sms/edit.html.erb
index c94b5c9d0..b9d9c743a 100644
--- a/app/views/verification/sms/edit.html.erb
+++ b/app/views/verification/sms/edit.html.erb
@@ -6,7 +6,7 @@
       <div class="small-4 column verification-step completed">
         <span class="number">1</span> <%= t("verification.step_1") %>
       </div>
-      <div class="small-4 column verification-step active">
+      <div class="small-4 column verification-step is-active">
         <span class="number">2</span> <%= t("verification.step_2") %>
       </div>
       <div class="small-4 column verification-step">
diff --git a/app/views/verification/sms/new.html.erb b/app/views/verification/sms/new.html.erb
index 19a8a2e3b..47ba8aed0 100644
--- a/app/views/verification/sms/new.html.erb
+++ b/app/views/verification/sms/new.html.erb
@@ -6,7 +6,7 @@
       <div class="small-4 column verification-step completed">
         <span class="number">1</span> <%= t("verification.step_1") %>
       </div>
-      <div class="small-4 column verification-step active">
+      <div class="small-4 column verification-step is-active">
         <span class="number">2</span> <%= t("verification.step_2") %>
       </div>
       <div class="small-4 column verification-step">
diff --git a/app/views/welcome/_feeds.html.erb b/app/views/welcome/_feeds.html.erb
index 3a898d835..3d9548ff2 100644
--- a/app/views/welcome/_feeds.html.erb
+++ b/app/views/welcome/_feeds.html.erb
@@ -1,15 +1,15 @@
-<div class="row margin-bottom feeds-list">
+<div class="row margin-bottom feeds-list" data-equalizer data-equalize-on="medium">
   <% @feeds.each do |feed| %>
 
     <% if feed_proposals?(feed) %>
       <div class="small-12 medium-8 column margin-top">
-        <div class="feed-content">
+        <div class="feed-content" data-equalizer-watch>
           <h3 class="title"><%= t("welcome.feed.most_active.#{feed.kind}") %></h3>
 
           <% feed.items.each do |item| %>
             <div class="<%= item.class.to_s.parameterize('_') %> row">
               <% if feature?(:allow_images) && item.image.present? %>
-                <div class="small-12 large-3 column">
+                <div class="small-12 medium-6 large-3 column">
                   <div class="feed-image">
                     <%= image_tag item.image_url(:thumb),
                                   alt: item.image.title.unicode_normalize %>
@@ -22,15 +22,15 @@
               </div>
             </div>
           <% end %>
-
-          <%= link_to t("welcome.feed.see_all_proposals"), proposals_path, class: "float-right see-all" %>
         </div>
+
+        <%= link_to t("welcome.feed.see_all_proposals"), proposals_path, class: "see-all" %>
       </div>
     <% end %>
 
     <% if feed_debates?(feed) %>
       <div class="small-12 medium-4 column margin-top">
-        <div class="feed-content">
+        <div class="feed-content" data-equalizer-watch>
           <h3 class="title"><%= t("welcome.feed.most_active.#{feed.kind}") %></h3>
 
           <% feed.items.each do |item| %>
@@ -38,9 +38,9 @@
               <strong><%= link_to item.title, url_for(item) %></strong>
             </div>
           <% end %>
-
-          <%= link_to t("welcome.feed.see_all_debates"), debates_path, class: "float-right see-all" %>
         </div>
+
+        <%= link_to t("welcome.feed.see_all_debates"), debates_path, class: "see-all" %>
       </div>
     <% end %>
 
diff --git a/app/views/welcome/_recommended_carousel.html.erb b/app/views/welcome/_recommended_carousel.html.erb
index 15eaea653..3141ef2b4 100644
--- a/app/views/welcome/_recommended_carousel.html.erb
+++ b/app/views/welcome/_recommended_carousel.html.erb
@@ -9,7 +9,7 @@
         <ul class="orbit-container no-bullet" tabindex="0" >
           <% recommendeds.each_with_index do |recommended, index| %>
 
-            <li class="orbit-slide <%= active_class(index) %>" data-slide="<%= index %>" style="position: relative; <%= slide_display(index) %>" aria-live="polite">
+            <li class="orbit-slide <%= is_active_class(index) %>" data-slide="<%= index %>" style="position: relative; <%= slide_display(index) %>" aria-live="polite">
               <div class="card">
                 <%= render_recommendation_image(recommended, image_default) %>
                 <div class="card-section">
@@ -29,8 +29,12 @@
 
       <div class="orbit-bullets">
         <% recommendeds.each_with_index do |recommended, index| %>
-          <button data-slide="<%= index %>" class="<%= active_class(index) %>">
-            <span class="show-for-sr">Second slide details.</span>
+          <button class="<%= is_active_class(index) %>"
+                  title="<%= t("welcome.recommended.slide", title: recommended.title) %>"
+                  data-slide="<%= index %>">
+            <span class="show-for-sr">
+              <%= t("welcome.recommended.slide", title: recommended.title) %>
+            </span>
           </button>
         <% end %>
       </div>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 4796a6d47..f670ff69c 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -16,11 +16,11 @@
 
 
   <div class="row">
-    <div class="small-12 column <%= 'medium-8' if feed_processes_enabled? %>">
+    <div class="small-12 column <%= 'large-8' if feed_processes_enabled? %>">
       <%= render "cards" %>
     </div>
 
-    <div class="small-12 medium-4 column">
+    <div class="small-12 large-4 column">
       <%= render "processes" %>
     </div>
   </div>
diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml
index efadcb055..9dce0c25b 100644
--- a/config/locales/en/activerecord.yml
+++ b/config/locales/en/activerecord.yml
@@ -59,8 +59,8 @@ en:
         one: "Citizen proposal"
         other: "Citizen proposals"
       spending_proposal:
-        one: "Spending proposal"
-        other: "Spending proposals"
+        one: "Investment project"
+        other: "Investment projects"
       site_customization/page:
         one: Custom page
         other: Custom pages
@@ -113,15 +113,11 @@ en:
         phase: "Phase"
         currency_symbol: "Currency"
       budget/investment:
-        heading_id: "Sección de presupuesto"
-        title: "Title"
-        description: "Description"
-        external_url: "External url"
-        administrator_id: "Administrator"
-        description: "Description"
-        external_url: "Link to additional documentation"
         heading_id: "Heading"
         title: "Title"
+        description: "Description"
+        external_url: "Link to additional documentation"
+        administrator_id: "Administrator"
         location: "Location (optional)"
         organization_name: "If you are proposing in the name of a collective/organization, or on behalf of more people, write its name"
         image: "Proposal descriptive image"
@@ -163,7 +159,7 @@ en:
         name: "Name of organisation"
         responsible_name: "Person responsible for the group"
       spending_proposal:
-        administrator_id: "Administrador"
+        administrator_id: "Administrator"
         association_name: "Association name"
         description: "Description"
         external_url: "Link to additional documentation"
@@ -205,6 +201,7 @@ en:
         body: Body
       legislation/process:
         title: Process Title
+        summary: Summary
         description: Description
         additional_info: Additional info
         start_date: Start date
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index adb0f727f..5e70d609f 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -5,7 +5,7 @@ en:
     actions:
       actions: Actions
       confirm: Are you sure?
-      confirm_hide: Confirm
+      confirm_hide: Confirm moderation
       hide: Hide
       hide_author: Hide author
       restore: Restore
@@ -27,8 +27,8 @@ en:
         preview: Preview
       banner:
         title: Title
-        description:  Description
-        target_url:  Link
+        description: Description
+        target_url: Link
         style: Style
         image: Image
         post_started_at: Post started at
@@ -41,7 +41,7 @@ en:
         form:
           error:
             one: "error prevented this banner from being saved"
-            other: 'errors prevented this banner from being saved'
+            other: "errors prevented this banner from being saved"
       new:
         creating: Create banner
     activity:
@@ -62,7 +62,7 @@ en:
           on_users: Users
         title: Moderator activity
         type: Type
-        no_activity: There ares no moderators activity.
+        no_activity: There are no moderators activity.
     budgets:
       index:
         title: Participatory budgets
@@ -71,7 +71,7 @@ en:
         filters:
           open: Open
           finished: Finished
-        budget_investments: See budget investments
+        budget_investments: Manage projects
         table_name: Name
         table_phase: Phase
         table_investments: Investments
@@ -192,6 +192,7 @@ en:
         table_evaluation: "Show to valuators"
         table_incompatible: "Incompatible"
         cannot_calculate_winners: The budget has to stay on phase "Balloting projects", "Reviewing Ballots" or "Finished budget" in order to calculate winners projects
+        see_results: "See results"
       show:
         assigned_admin: Assigned administrator
         assigned_valuators: Assigned valuators
@@ -331,7 +332,7 @@ en:
           enabled: Enabled
           process: Process
           debate_phase: Debate phase
-          allegations_phase: Allegations phase
+          allegations_phase: Drafting phase
           proposals_phase: Proposals phase
           start: Start
           end: End
@@ -363,7 +364,7 @@ en:
           status_planned: Planned
         subnav:
           info: Information
-          draft_texts: Text
+          draft_texts: Drafting
           questions: Debate
           proposals: Proposals
       proposals:
@@ -371,9 +372,6 @@ en:
           title: Proposals
           back: Back
         form:
-          header_information: Information header
-          header_information_description: Provide information about the proposals. This text will be displayed as an alert in the Proposals section inside this Process. Use Markdown to format the text.
-          header_information_placeholder: Add information for the proposals' header
           custom_categories: Categories
           custom_categories_description: Categories that users can select creating the proposal.
       draft_versions:
@@ -441,8 +439,10 @@ en:
             error: Error
         form:
           add_option: Add option
-          title_placeholder: Add a title
+          title: Question
+          title_placeholder: Add question
           value_placeholder: Add a closed answer
+          question_options: "Possible answers (optional, by default open answers)"
         index:
           back: Back
           title: Questions associated to this process
@@ -474,7 +474,7 @@ en:
       activity: Moderator activity
       admin: Admin menu
       banner: Manage banners
-      poll_questions: Poll questions
+      poll_questions: Questions
       proposals_topics: Proposals topics
       budgets: Participatory budgets
       geozones: Manage geozones
@@ -496,7 +496,7 @@ en:
       poll_shifts: Manage shifts
       officials: Officials
       organizations: Organisations
-      settings: Configuration settings
+      settings: Global settings
       spending_proposals: Spending proposals
       stats: Statistics
       signature_sheets: Signature Sheets
@@ -505,13 +505,12 @@ en:
         pages: Custom Pages
         images: Custom Images
         content_blocks: Custom content blocks
-      title_categories: Categories
       title_moderated_content: Moderated content
       title_budgets: Budgets
       title_polls: Polls
       title_profiles: Profiles
-      title_banners: Banners
-      title_site_customization: Site customization
+      title_settings: Settings
+      title_site_customization: Site content
       legislation: Collaborative Legislation
       users: Users
     administrators:
@@ -566,6 +565,7 @@ en:
         empty_newsletters: There are no newsletters to show
       new:
         title: New newsletter
+        from: E-mail address that will appear as sending the newsletter
       edit:
         title: Edit newsletter
       show:
@@ -575,7 +575,7 @@ en:
         sent_at: Sent at
         subject: Subject
         segment_recipient: Recipients
-        from: From
+        from: E-mail address that will appear as sending the newsletter
         body: Email content
         body_help_text: This is how the users will see the email
         send_alert: Are you sure you want to send this newsletter to %{n} users?
@@ -674,7 +674,7 @@ en:
         search_officer_placeholder: Search officer
         search_officer_text: Search for an officer to assign a new shift
         select_date: "Select day"
-        no_voting_days: "Los dias de votación terminaron"
+        no_voting_days: "Voting days ended"
         select_task: "Select task"
         table_shift: "Shift"
         table_email: "Email"
@@ -723,8 +723,8 @@ en:
         table_location: "Location"
     polls:
       index:
-        title: "List of polls"
-        no_polls: "There are no polls."
+        title: "List of active polls"
+        no_polls: "There are no polls coming up."
         create: "Create poll"
         name: "Name"
         dates: "Dates"
@@ -836,8 +836,8 @@ en:
         title: "Results by booth"
     booths:
       index:
-        title: "List of booths"
-        no_booths: "There are no booths."
+        title: "List of active booths"
+        no_booths: "There are no active booths for any upcoming poll."
         add_booth: "Add booth"
         name: "Name"
         location: "Location"
@@ -965,6 +965,7 @@ en:
       description: Description
       image: Image
       show_image: Show image
+      moderated_content: "Check the content moderated by the moderators, and confirm if the moderation has been done correctly."
     spending_proposals:
       index:
         geozone_filter_all: All zones
@@ -1127,6 +1128,7 @@ en:
         add_tag: Add a new proposal topic
         title: Proposal topics
         topic: Topic
+        help: "When a user creates a proposal, the following topics are suggested as default tags."
       name:
         placeholder: Type the name of the topic
     users:
@@ -1149,11 +1151,11 @@ en:
         title: Incomplete verifications
     site_customization:
       content_blocks:
-        form:
-          content_blocks_information: Information about content blocks
-          content_block_about: You can create HTML content blocks to be inserted in the header or the footer of your CONSUL.
-          content_block_top_links_html: "<strong>Header blocks (top_links)</strong> are blocks of links that must have this format:"
-          content_block_footer_html: "<strong>Footer blocks</strong> can have any format and can be used to insert Javascript, CSS or custom HTML."
+        information: Information about content blocks
+        about: You can create HTML content blocks to be inserted in the header or the footer of your CONSUL.
+        top_links_html: "<strong>Header blocks (top_links)</strong> are blocks of links that must have this format:"
+        footer_html: "<strong>Footer blocks</strong> can have any format and can be used to insert Javascript, CSS or custom HTML."
+        no_blocks: "There are no content blocks."
         create:
           notice: Content block created successfully
           error: Content block couldn't be created
diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml
index dd53a80be..f43042052 100644
--- a/config/locales/en/budgets.yml
+++ b/config/locales/en/budgets.yml
@@ -30,14 +30,14 @@ en:
         unselected: See investments not selected for balloting phase
     phase:
       drafting: Draft (Not visible to the public)
-      informing: Informing
+      informing: Information
       accepting: Accepting projects
       reviewing: Reviewing projects
       selecting: Selecting projects
       valuating: Valuating projects
       publishing_prices: Publishing projects prices
-      balloting: Balloting projects
-      reviewing_ballots: Reviewing Ballots
+      balloting: Voting projects
+      reviewing_ballots: Reviewing voting
       finished: Finished budget
     index:
       title: Participatory budgets
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index 8d485e023..00fb3d90c 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -807,6 +807,7 @@ en:
         btn_text_link: All recommended proposals
       budget_investments:
         title: Recommended investments
+      slide: "See %{title}"
     verification:
       i_dont_have_an_account: I don't have an account
       i_have_an_account: I already have an account
diff --git a/config/locales/en/management.yml b/config/locales/en/management.yml
index 745bdc81a..359254e3c 100644
--- a/config/locales/en/management.yml
+++ b/config/locales/en/management.yml
@@ -70,7 +70,7 @@ en:
       support_budget_investments: Support Budget Investments
       users: Users
       edit_user_accounts: Edit user account
-      user_invites: User's invites
+      user_invites: Send invitations
     permissions:
       create_proposals: Create proposals
       debates: Engage in debates
@@ -140,8 +140,8 @@ en:
       new:
         label: Emails
         info: "Enter the emails separated by commas (',')"
-        submit: Send invites
-        title: User's invites
+        submit: Send invitations
+        title: Send invitations
       create:
         success_html: <strong>%{count} invitations</strong> have been sent.
-        title: User's invites
\ No newline at end of file
+        title: Send invitations
\ No newline at end of file
diff --git a/config/locales/en/settings.yml b/config/locales/en/settings.yml
index 1b4444274..938717187 100644
--- a/config/locales/en/settings.yml
+++ b/config/locales/en/settings.yml
@@ -47,6 +47,9 @@ en:
       map: Proposals and budget investments geolocation
       allow_images: Allow upload and show images
       allow_attached_documents: Allow upload and show of attached documents
+      guides: Guides to create proposals or investment projects
+      public_stats: Public stats
+    related_content_score_threshold: Related content score threshold
     map_latitude: Latitude
     map_longitude: Longitude
     map_zoom: Zoom
diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml
index 56a7ea8b7..c5d8a63bc 100644
--- a/config/locales/es/activerecord.yml
+++ b/config/locales/es/activerecord.yml
@@ -201,6 +201,7 @@ es:
         body: Contenido
       legislation/process:
         title: Título del proceso
+        summary: Resumen
         description: En qué consiste
         additional_info: Información adicional
         start_date: Fecha de inicio del proceso
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index aed1d068a..48a2ee30c 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -5,7 +5,7 @@ es:
     actions:
       actions: Acciones
       confirm: '¿Estás seguro?'
-      confirm_hide: Confirmar
+      confirm_hide: Confirmar moderación
       hide: Ocultar
       hide_author: Bloquear al autor
       restore: Volver a mostrar
@@ -41,7 +41,7 @@ es:
         form:
           error:
             one: "error impidió guardar el banner"
-            other: 'errores impidieron guardar el banner.'
+            other: "errores impidieron guardar el banner"
       new:
         creating: Crear banner
     activity:
@@ -71,7 +71,7 @@ es:
         filters:
           open: Abiertos
           finished: Terminados
-        budget_investments: Ver proyectos de gasto
+        budget_investments: Gestionar proyectos de gasto
         table_name: Nombre
         table_phase: Fase
         table_investments: Proyectos de gasto
@@ -192,6 +192,7 @@ es:
         table_evaluation: "Mostrar a evaluadores"
         table_incompatible: "Incompatible"
         cannot_calculate_winners: El presupuesto debe estar en las fases "Votación final", "Votación finalizada" o "Resultados" para poder calcular las propuestas ganadoras
+        see_results: "Ver resultados"
       show:
         assigned_admin: Administrador asignado
         assigned_valuators: Evaluadores asignados
@@ -266,7 +267,7 @@ es:
       edit:
         title: Editar hito
       create:
-        notice: Nuevo hito creado con éxito!
+        notice: ¡Nuevo hito creado con éxito!
       update:
         notice: Hito actualizado
       delete:
@@ -330,8 +331,8 @@ es:
         form:
           enabled: Habilitado
           process: Proceso
-          debate_phase: Fase previa
-          allegations_phase: Fase de alegaciones
+          debate_phase: Fase de debate
+          allegations_phase: Fase de redacción
           proposals_phase: Fase de propuestas
           start: Inicio
           end: Fin
@@ -363,7 +364,7 @@ es:
           status_planned: Próximamente
         subnav:
           info: Información
-          draft_texts: Texto
+          draft_texts: Redacción
           questions: Debate
           proposals: Propuestas
       proposals:
@@ -371,9 +372,6 @@ es:
           title: Propuestas
           back: Volver
         form:
-          header_information: Encabezado de información
-          header_information_description: Proporciona información sobre el recorrido de las propuestas. Este texto se mostrará como una alerta en el encabezado de la sección de Propuestas dentro de este proceso. Usa Markdown para formatear el texto.
-          header_information_placeholder: Añade información para el encabezado de las las propuestas
           custom_categories: Categorías
           custom_categories_description: Categorías que el usuario puede seleccionar al crear la propuesta.
       draft_versions:
@@ -441,8 +439,10 @@ es:
             error: Error
         form:
           add_option: +Añadir respuesta cerrada
+          title: Pregunta
           title_placeholder: Escribe un título a la pregunta
           value_placeholder: Escribe una respuesta cerrada
+          question_options: "Posibles respuestas (opcional, por defecto respuestas abiertas)"
         index:
           back: Volver
           title: Preguntas asociadas a este proceso
@@ -474,7 +474,7 @@ es:
       activity: Actividad de moderadores
       admin: Menú de administración
       banner: Gestionar banners
-      poll_questions: Preguntas ciudadanas
+      poll_questions: Preguntas
       proposals_topics: Temas de propuestas
       budgets: Presupuestos participativos
       geozones: Gestionar distritos
@@ -505,13 +505,12 @@ es:
         pages: Personalizar páginas
         images: Personalizar imágenes
         content_blocks: Personalizar bloques
-      title_categories: Categorías
       title_moderated_content: Contenido moderado
       title_budgets: Presupuestos
       title_polls: Votaciones
       title_profiles: Perfiles
-      title_banners: Banners
-      title_site_customization: Personalizar sitio
+      title_settings: Configuración
+      title_site_customization: Contenido del sitio
       legislation: Legislación colaborativa
       users: Usuarios
     administrators:
@@ -566,6 +565,7 @@ es:
         empty_newsletters: No hay newsletters para mostrar
       new:
         title: Nueva newsletter
+        from: Dirección de correo electrónico que aparecerá como remitente de la newsletter
       edit:
         title: Editar newsletter
       show:
@@ -575,7 +575,7 @@ es:
         sent_at: Enviado
         subject: Asunto
         segment_recipient: Destinatarios
-        from: Enviado por
+        from: Dirección de correo electrónico que aparecerá como remitente de la newsletter
         body: Contenido del email
         body_help_text: Así es como verán el email los usuarios
         send_alert: ¿Estás seguro/a de que quieres enviar esta newsletter a %{n} usuarios?
@@ -723,8 +723,8 @@ es:
         table_location: "Ubicación"
     polls:
       index:
-        title: "Listado de votaciones"
-        no_polls: "No hay ninguna votación."
+        title: "Listado de votaciones activas"
+        no_polls: "No hay ninguna votación próximamente."
         create: "Crear votación"
         name: "Nombre"
         dates: "Fechas"
@@ -836,8 +836,8 @@ es:
         title: "Resultados por urna"
     booths:
       index:
-        title: "Lista de urnas"
-        no_booths: "No hay urnas."
+        title: "Listado de urnas activas"
+        no_booths: "No hay urnas activas para ninguna votación próxima."
         add_booth: "Añadir urna"
         name: "Nombre"
         location: "Ubicación"
@@ -965,6 +965,7 @@ es:
       description: Descripción
       image: Imagen
       show_image: Mostrar imagen
+      moderated_content: "Revisa el contenido moderado por los moderadores, y confirma si la moderación se ha realizado correctamente."
     spending_proposals:
       index:
         geozone_filter_all: Todos los ámbitos de actuación
@@ -1127,6 +1128,7 @@ es:
         add_tag: Añade un nuevo tema de propuesta
         title: Temas de propuesta
         topic: Tema
+        help: "Cuando un usuario crea una propuesta se le sugieren como etiquetas por defecto los siguientes temas."
       name:
         placeholder: Escribe el nombre del tema
     users:
@@ -1149,11 +1151,11 @@ es:
         title: Verificaciones incompletas
     site_customization:
       content_blocks:
-        form:
-          content_blocks_information: Información sobre los bloques de texto
-          content_block_about: Puedes crear bloques de HTML que se incrustarán en la cabecera o el pie de tu CONSUL.
-          content_block_top_links_html: "Los <strong>bloques de la cabecera (top_links)</strong> son bloques de enlaces que deben crearse con este formato:"
-          content_block_footer_html: "Los <strong>bloques del pie (footer)</strong> pueden tener cualquier formato y se pueden utilizar para guardar huellas Javascript, contenido CSS o contenido HTML personalizado."
+        information: Información sobre los bloques de texto
+        about: Puedes crear bloques de HTML que se incrustarán en la cabecera o el pie de tu CONSUL.
+        top_links_html: "Los <strong>bloques de la cabecera (top_links)</strong> son bloques de enlaces que deben crearse con este formato:"
+        footer_html: "Los <strong>bloques del pie (footer)</strong> pueden tener cualquier formato y se pueden utilizar para guardar huellas Javascript, contenido CSS o contenido HTML personalizado."
+        no_blocks: "No hay bloques de texto."
         create:
           notice: Bloque creado correctamente
           error: No se ha podido crear el bloque
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index fee56b4c9..315769199 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -806,6 +806,7 @@ es:
         btn_text_link: Todas las propuestas recomendadas
       budget_investments:
         title: Presupuestos recomendados
+      slide: "Ver %{title}"
     verification:
       i_dont_have_an_account: No tengo cuenta, quiero crear una y verificarla
       i_have_an_account: Ya tengo una cuenta que quiero verificar
diff --git a/config/locales/es/management.yml b/config/locales/es/management.yml
index ac1eab472..1fb5f4a37 100644
--- a/config/locales/es/management.yml
+++ b/config/locales/es/management.yml
@@ -70,7 +70,7 @@ es:
       support_budget_investments: Apoyar proyectos de gasto
       users: Usuarios
       edit_user_accounts: Editar cuenta de usuario
-      user_invites: Invitaciones para usuarios
+      user_invites: Enviar invitaciones
     permissions:
       create_proposals: Crear nuevas propuestas
       debates: Participar en debates
@@ -141,7 +141,7 @@ es:
         label: Emails
         info: "Introduce los emails separados por comas (',')"
         submit: Enviar invitaciones
-        title: Invitaciones para usuarios
+        title: Enviar invitaciones
       create:
         success_html: Se han enviado <strong>%{count} invitaciones</strong>.
-        title: Invitaciones para usuarios
+        title: Enviar invitaciones
diff --git a/config/locales/es/settings.yml b/config/locales/es/settings.yml
index 161fae452..57dfaae50 100644
--- a/config/locales/es/settings.yml
+++ b/config/locales/es/settings.yml
@@ -47,6 +47,9 @@ es:
       map: Geolocalización de propuestas y proyectos de gasto
       allow_images: Permitir subir y mostrar imágenes
       allow_attached_documents: Permitir creación de documentos adjuntos
+      guides: Guías para crear propuestas o proyectos de inversión
+      public_stats: Estadísticas públicas
+    related_content_score_threshold: Umbral de puntuación de contenido relacionado
     map_latitude: Latitud
     map_longitude: Longitud
     map_zoom: Zoom
diff --git a/docker-compose.yml b/docker-compose.yml
index d5399089e..5c03e071b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,31 +1,40 @@
-# service configuration for our database
-database:
+version: '3'
+services:
+  # service configuration for our database
+  database:
 
-  # use the preferred version of the official Postgres image
-  # see https://hub.docker.com/_/postgres/
-  image: postgres:9.4.5
+    # use the preferred version of the official Postgres image
+    # see https://hub.docker.com/_/postgres/
+    image: postgres:9.4.5
 
-  # persist the database between containers by storing it in a volume
-  volumes:
-    - docker-example-postgres:/var/lib/postgresql/data
+    # persist the database between containers by storing it in a volume
+    volumes:
+      - docker-example-postgres:/var/lib/postgresql/data
 
-# service configuration for our dockerized Rails app
-app:
+  # service configuration for our dockerized Rails app
+  app:
 
-  # use the Dockerfile next to this file
-  build: .
+    # use the Dockerfile next to this file
+    build: .
+    entrypoint: /usr/local/bin/entrypoint.sh
+    command: bundle exec rails s -p 3000 -b '0.0.0.0'
+    working_dir: /var/www/consul
 
-  # rely on the RAILS_ENV value of the host machine
-  # environment:
-  #RAILS_ENV: $RAILS_ENV
+    # rely on the RAILS_ENV value of the host machine
+    # environment:
+    #RAILS_ENV: $RAILS_ENV
 
-  # makes the app container aware of the DB container
-  links:
-    - database
+    # makes the app container aware of the DB container
+    depends_on:
+      - database
 
-  # expose the port we configured Unicorn to bind to
-  ports:
-    - "3000:3000"
-  # map our application source code, in full, to the application root of our container
-  volumes:
-    - .:/var/www/consul
+    # expose the port we configured Unicorn to bind to
+    ports:
+      - "3000:3000"
+    # map our application source code, in full, to the application root of our container
+    volumes:
+      - .:/var/www/consul:delegated
+      - bundle:/usr/local/bundle:delegated
+volumes:
+  docker-example-postgres: {}
+  bundle: {}
diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh
new file mode 100755
index 000000000..e3a7bede6
--- /dev/null
+++ b/scripts/entrypoint.sh
@@ -0,0 +1,17 @@
+#!/bin/sh -x
+
+USER_UID=$(stat -c %u /var/www/consul/Gemfile)
+USER_GID=$(stat -c %g /var/www/consul/Gemfile)
+
+export USER_UID
+export USER_GID
+
+usermod -u "$USER_UID" consul 2> /dev/null
+groupmod -g "$USER_GID" consul 2> /dev/null
+usermod -g "$USER_GID" consul 2> /dev/null
+
+chown -R -h "$USER_UID" "$BUNDLE_PATH"
+chgrp -R -h "$USER_GID" "$BUNDLE_PATH"
+
+/usr/bin/sudo -EH -u consul "$@"
+
diff --git a/spec/features/admin/banners_spec.rb b/spec/features/admin/banners_spec.rb
index d03b8f0d5..d39926cce 100644
--- a/spec/features/admin/banners_spec.rb
+++ b/spec/features/admin/banners_spec.rb
@@ -114,7 +114,7 @@ feature 'Admin banners magement' do
     visit admin_root_path
 
     within('#side_menu') do
-      click_link "Banners"
+      click_link "Site content"
       click_link "Manage banners"
     end
 
diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb
index 4a1beaacd..1cc2c36a3 100644
--- a/spec/features/admin/budget_investments_spec.rb
+++ b/spec/features/admin/budget_investments_spec.rb
@@ -1056,7 +1056,7 @@ feature 'Admin budget investments' do
 
       visit admin_budget_budget_investments_path(budget)
 
-      expect(page).not_to have_css("#budget_investment_visible_to_valuators")
+      expect(page).to have_css("#budget_investment_visible_to_valuators")
 
       within('#filter-subnav') { click_link 'Under valuation' }
 
@@ -1127,4 +1127,94 @@ feature 'Admin budget investments' do
     end
   end
 
+  context "Mark as visible to valuators" do
+
+    let(:valuator) { create(:valuator) }
+    let(:admin) { create(:administrator) }
+
+    let(:group) { create(:budget_group, budget: budget) }
+    let(:heading) { create(:budget_heading, group: group) }
+
+    let(:investment1) { create(:budget_investment, heading: heading) }
+    let(:investment2) { create(:budget_investment, heading: heading) }
+
+    scenario "Mark as visible to valuator", :js do
+      investment1.valuators << valuator
+      investment2.valuators << valuator
+      investment1.update(administrator: admin)
+      investment2.update(administrator: admin)
+
+      visit admin_budget_budget_investments_path(budget)
+
+      within("#budget_investment_#{investment1.id}") do
+        check "budget_investment_visible_to_valuators"
+      end
+
+      visit admin_budget_budget_investments_path(budget)
+      within('#filter-subnav') { click_link 'Under valuation' }
+
+      within("#budget_investment_#{investment1.id}") do
+        expect(find("#budget_investment_visible_to_valuators")).to be_checked
+      end
+    end
+
+    scenario "Unmark as visible to valuator", :js do
+      budget.update(phase: 'valuating')
+
+      valuator = create(:valuator)
+      admin = create(:administrator)
+
+      group = create(:budget_group, budget: budget)
+      heading = create(:budget_heading, group: group)
+
+      investment1 = create(:budget_investment, heading: heading, visible_to_valuators: true)
+      investment2 = create(:budget_investment, heading: heading, visible_to_valuators: true)
+
+      investment1.valuators << valuator
+      investment2.valuators << valuator
+      investment1.update(administrator: admin)
+      investment2.update(administrator: admin)
+
+      visit admin_budget_budget_investments_path(budget)
+      within('#filter-subnav') { click_link 'Under valuation' }
+
+      within("#budget_investment_#{investment1.id}") do
+        uncheck "budget_investment_visible_to_valuators"
+      end
+
+      visit admin_budget_budget_investments_path(budget)
+
+      within("#budget_investment_#{investment1.id}") do
+        expect(find("#budget_investment_visible_to_valuators")).not_to be_checked
+      end
+    end
+
+    scenario "Showing the valuating checkbox" do
+      investment1 = create(:budget_investment, budget: budget, visible_to_valuators: true)
+      investment2 = create(:budget_investment, budget: budget, visible_to_valuators: false)
+
+      investment1.valuators << create(:valuator)
+      investment2.valuators << create(:valuator)
+      investment2.valuators << create(:valuator)
+      investment1.update(administrator: create(:administrator))
+      investment2.update(administrator: create(:administrator))
+
+      visit admin_budget_budget_investments_path(budget)
+
+      expect(page).to have_css("#budget_investment_visible_to_valuators")
+
+      within('#filter-subnav') { click_link 'Under valuation' }
+
+      within("#budget_investment_#{investment1.id}") do
+        valuating_checkbox = find('#budget_investment_visible_to_valuators')
+        expect(valuating_checkbox).to be_checked
+      end
+
+      within("#budget_investment_#{investment2.id}") do
+        valuating_checkbox = find('#budget_investment_visible_to_valuators')
+        expect(valuating_checkbox).not_to be_checked
+      end
+    end
+  end
+
 end
diff --git a/spec/features/admin/comments_spec.rb b/spec/features/admin/comments_spec.rb
index 1f87bc105..b06b575c5 100644
--- a/spec/features/admin/comments_spec.rb
+++ b/spec/features/admin/comments_spec.rb
@@ -81,7 +81,7 @@ feature 'Admin comments' do
     comment = create(:comment, :hidden, body: 'SPAM')
     visit admin_comments_path
 
-    click_link 'Confirm'
+    click_link 'Confirm moderation'
 
     expect(page).not_to have_content(comment.body)
     click_link('Confirmed')
diff --git a/spec/features/admin/debates_spec.rb b/spec/features/admin/debates_spec.rb
index 45d2040c6..012a57570 100644
--- a/spec/features/admin/debates_spec.rb
+++ b/spec/features/admin/debates_spec.rb
@@ -33,7 +33,7 @@ feature 'Admin debates' do
     debate = create(:debate, :hidden)
     visit admin_debates_path
 
-    click_link 'Confirm'
+    click_link 'Confirm moderation'
 
     expect(page).not_to have_content(debate.title)
     click_link('Confirmed')
diff --git a/spec/features/admin/hidden_users_spec.rb b/spec/features/admin/hidden_users_spec.rb
index 0f41e3573..121e52b69 100644
--- a/spec/features/admin/hidden_users_spec.rb
+++ b/spec/features/admin/hidden_users_spec.rb
@@ -38,7 +38,7 @@ feature 'Admin hidden users' do
     user = create(:user, :hidden)
     visit admin_hidden_users_path
 
-    click_link 'Confirm'
+    click_link 'Confirm moderation'
 
     expect(page).not_to have_content(user.username)
     click_link('Confirmed')
diff --git a/spec/features/admin/legislation/draft_versions_spec.rb b/spec/features/admin/legislation/draft_versions_spec.rb
index 6f33c265f..d2fd922e4 100644
--- a/spec/features/admin/legislation/draft_versions_spec.rb
+++ b/spec/features/admin/legislation/draft_versions_spec.rb
@@ -26,7 +26,7 @@ feature 'Admin legislation draft versions' do
       visit admin_legislation_processes_path(filter: 'all')
 
       click_link 'An example legislation process'
-      click_link 'Text'
+      click_link 'Drafting'
       click_link 'Version 1'
 
       expect(page).to have_content(draft_version.title)
@@ -49,7 +49,7 @@ feature 'Admin legislation draft versions' do
       expect(page).to have_content 'An example legislation process'
 
       click_link 'An example legislation process'
-      click_link 'Text'
+      click_link 'Drafting'
 
       click_link 'Create version'
 
@@ -82,7 +82,7 @@ feature 'Admin legislation draft versions' do
       expect(page).to have_content 'An example legislation process'
 
       click_link 'An example legislation process'
-      click_link 'Text'
+      click_link 'Drafting'
 
       click_link 'Version 1'
 
diff --git a/spec/features/admin/poll/booths_spec.rb b/spec/features/admin/poll/booths_spec.rb
index ba7ca5cfb..d8e399f09 100644
--- a/spec/features/admin/poll/booths_spec.rb
+++ b/spec/features/admin/poll/booths_spec.rb
@@ -14,7 +14,7 @@ feature 'Admin booths' do
       click_link "Booths location"
     end
 
-    expect(page).to have_content "There are no booths"
+    expect(page).to have_content "There are no active booths for any upcoming poll."
   end
 
   scenario 'Index' do
diff --git a/spec/features/admin/poll/polls_spec.rb b/spec/features/admin/poll/polls_spec.rb
index 482d461cc..e7e4d6bba 100644
--- a/spec/features/admin/poll/polls_spec.rb
+++ b/spec/features/admin/poll/polls_spec.rb
@@ -83,25 +83,67 @@ feature 'Admin polls' do
 
     expect(page).to have_css("img[alt='#{poll.image.title}']")
 
-    expect(page).to have_css("#poll_results_enabled")
-    expect(page).to have_css("#poll_stats_enabled")
-
     fill_in "poll_name", with: "Next Poll"
     fill_in 'poll_ends_at', with: end_date.strftime("%d/%m/%Y")
-    check 'poll_results_enabled'
-    check 'poll_stats_enabled'
 
     click_button "Update poll"
 
     expect(page).to have_content "Poll updated successfully"
     expect(page).to have_content "Next Poll"
     expect(page).to have_content I18n.l(end_date.to_date)
+  end
 
-    click_link "Edit poll"
+  scenario 'Enable stats and results' do
+    poll = create(:poll)
+
+    booth_assignment_1 = create(:poll_booth_assignment, poll: poll)
+    booth_assignment_2 = create(:poll_booth_assignment, poll: poll)
+    booth_assignment_3 = create(:poll_booth_assignment, poll: poll)
+
+    question_1 = create(:poll_question, poll: poll)
+    create(:poll_question_answer, title: 'Oui', question: question_1)
+    create(:poll_question_answer, title: 'Non', question: question_1)
+
+    question_2 = create(:poll_question, poll: poll)
+    create(:poll_question_answer, title: "Aujourd'hui", question: question_2)
+    create(:poll_question_answer, title: 'Demain', question: question_2)
+
+    [booth_assignment_1, booth_assignment_2, booth_assignment_3].each do |ba|
+      create(:poll_partial_result,
+             booth_assignment: ba,
+             question: question_1,
+             answer: 'Oui',
+             amount: 11)
+
+      create(:poll_partial_result,
+             booth_assignment: ba,
+             question: question_2,
+             answer: 'Demain',
+             amount: 5)
+    end
+
+    create(:poll_recount,
+           booth_assignment: booth_assignment_1,
+           white_amount: 21,
+           null_amount: 44,
+           total_amount: 66)
+
+    visit admin_poll_results_path(poll)
+
+    expect(page).to have_field('poll_stats_enabled', checked: false)
+    expect(page).to have_field('poll_results_enabled', checked: false)
+
+    check 'poll_stats_enabled'
+    check 'poll_results_enabled'
+
+    click_button 'Update poll'
+
+    expect(page).to have_content('Poll updated successfully')
+
+    click_link 'Results'
 
-    expect(page).to have_field('poll_results_enabled', checked: true)
     expect(page).to have_field('poll_stats_enabled', checked: true)
-
+    expect(page).to have_field('poll_results_enabled', checked: true)
   end
 
   scenario 'Edit from index' do
diff --git a/spec/features/admin/poll/questions_spec.rb b/spec/features/admin/poll/questions_spec.rb
index 4399e3e64..d499869b9 100644
--- a/spec/features/admin/poll/questions_spec.rb
+++ b/spec/features/admin/poll/questions_spec.rb
@@ -36,19 +36,16 @@ feature 'Admin poll questions' do
       Pursued by the Empire's sinister agents, Princess Leia races home aboard her starship, custodian of the stolen plans that can save her
        people and restore freedom to the galaxy....
     }
-    video_url = "https://puppyvideos.com"
 
     visit admin_questions_path
     click_link "Create question"
 
     select 'Movies', from: 'poll_question_poll_id'
     fill_in 'poll_question_title', with: title
-    fill_in 'poll_question_video_url', with: video_url
 
     click_button 'Save'
 
     expect(page).to have_content(title)
-    expect(page).to have_content(video_url)
   end
 
   scenario 'Create from successful proposal index' do
diff --git a/spec/features/admin/proposals_spec.rb b/spec/features/admin/proposals_spec.rb
index 0c65aa899..1f48fb482 100644
--- a/spec/features/admin/proposals_spec.rb
+++ b/spec/features/admin/proposals_spec.rb
@@ -45,7 +45,7 @@ feature 'Admin proposals' do
     proposal = create(:proposal, :hidden)
     visit admin_proposals_path
 
-    click_link 'Confirm'
+    click_link 'Confirm moderation'
 
     expect(page).not_to have_content(proposal.title)
     click_link('Confirmed')
diff --git a/spec/features/budgets/ballots_spec.rb b/spec/features/budgets/ballots_spec.rb
index 86e6f0596..309f1b531 100644
--- a/spec/features/budgets/ballots_spec.rb
+++ b/spec/features/budgets/ballots_spec.rb
@@ -261,7 +261,7 @@ feature 'Ballots' do
       click_link "States"
 
       expect(page).to have_content "California"
-      expect(page).to have_css("#budget_heading_#{california.id}.active")
+      expect(page).to have_css("#budget_heading_#{california.id}.is-active")
     end
 
     scenario 'Change my heading', :js do
@@ -283,8 +283,8 @@ feature 'Ballots' do
 
       visit budget_path(budget)
       click_link "States"
-      expect(page).to have_css("#budget_heading_#{new_york.id}.active")
-      expect(page).not_to have_css("#budget_heading_#{california.id}.active")
+      expect(page).to have_css("#budget_heading_#{new_york.id}.is-active")
+      expect(page).not_to have_css("#budget_heading_#{california.id}.is-active")
     end
 
     scenario 'View another heading' do
diff --git a/spec/features/budgets/budgets_spec.rb b/spec/features/budgets/budgets_spec.rb
index ba5935f70..2400a8c6a 100644
--- a/spec/features/budgets/budgets_spec.rb
+++ b/spec/features/budgets/budgets_spec.rb
@@ -22,7 +22,7 @@ feature 'Budgets' do
         expect(page).to have_content(budget.name)
         expect(page).to have_content(budget.description)
         expect(page).to have_content('Actual phase')
-        expect(page).to have_content('Informing')
+        expect(page).to have_content('Information')
         expect(page).to have_link('Help with participatory budgets')
         expect(page).to have_link('See all phases')
       end
@@ -188,7 +188,7 @@ feature 'Budgets' do
     expect(page).to have_content "This is the summary for finished phase"
     expect(page).to have_content "March 21, 2018 - March 29, 2018"
 
-    expect(page).to have_css(".phase.active", count: 1)
+    expect(page).to have_css(".phase.is-active", count: 1)
   end
 
   context "Index map" do
@@ -246,6 +246,77 @@ feature 'Budgets' do
     end
   end
 
+  xcontext "Index map" do
+
+    let(:group) { create(:budget_group, budget: budget) }
+    let(:heading) { create(:budget_heading, group: group) }
+
+    before do
+      Setting['feature.map'] = true
+    end
+
+    scenario "Display investment's map location markers" , :js do
+      investment1 = create(:budget_investment, heading: heading)
+      investment2 = create(:budget_investment, heading: heading)
+      investment3 = create(:budget_investment, heading: heading)
+
+      investment1.create_map_location(longitude: 40.1234, latitude: 3.1234, zoom: 10)
+      investment2.create_map_location(longitude: 40.1235, latitude: 3.1235, zoom: 10)
+      investment3.create_map_location(longitude: 40.1236, latitude: 3.1236, zoom: 10)
+
+      visit budgets_path
+
+      within ".map_location" do
+        expect(page).to have_css(".map-icon", count: 3)
+      end
+    end
+
+    scenario "Display selected investment's map location markers" , :js do
+
+      budget.update(phase: :valuating)
+
+      investment1 = create(:budget_investment, :selected, heading: heading)
+      investment2 = create(:budget_investment, :selected, heading: heading)
+      investment3 = create(:budget_investment, heading: heading)
+
+      investment1.create_map_location(longitude: 40.1234, latitude: 3.1234, zoom: 10)
+      investment2.create_map_location(longitude: 40.1235, latitude: 3.1235, zoom: 10)
+      investment3.create_map_location(longitude: 40.1236, latitude: 3.1236, zoom: 10)
+
+      visit budgets_path
+
+      within ".map_location" do
+        expect(page).to have_css(".map-icon", count: 2)
+      end
+    end
+
+    scenario "Skip invalid map markers" , :js do
+      map_locations = []
+      map_locations << { longitude: 40.123456789, latitude: 3.12345678 }
+      map_locations << { longitude: 40.123456789, latitude: "*******" }
+      map_locations << { longitude: "**********", latitude: 3.12345678 }
+
+      budget_map_locations = map_locations.map do |map_location|
+        {
+          lat: map_location[:latitude],
+          long: map_location[:longitude],
+          investment_title: "#{rand(999)}",
+          investment_id: "#{rand(999)}",
+          budget_id: budget.id
+        }
+      end
+
+      allow_any_instance_of(BudgetsHelper).
+      to receive(:current_budget_map_locations).and_return(budget_map_locations)
+
+      visit budgets_path
+
+      within ".map_location" do
+        expect(page).to have_css(".map-icon", count: 1)
+      end
+    end
+  end
+
   context 'Show' do
 
     scenario "List all groups" do
diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb
index 26742c05f..1ad7a82e9 100644
--- a/spec/features/budgets/investments_spec.rb
+++ b/spec/features/budgets/investments_spec.rb
@@ -580,7 +580,7 @@ feature 'Budget Investments' do
 
       visit budget_investments_path(budget, heading_id: heading.id)
       click_link 'highest rated'
-      expect(page).to have_selector('a.active', text: 'highest rated')
+      expect(page).to have_selector('a.is-active', text: 'highest rated')
 
       within '#budget-investments' do
         expect(best_proposal.title).to appear_before(medium_proposal.title)
@@ -1276,7 +1276,7 @@ feature 'Budget Investments' do
       visit budget_investments_path(budget, heading_id: heading.id)
 
       click_link 'by price'
-      expect(page).to have_selector('a.active', text: 'by price')
+      expect(page).to have_selector('a.is-active', text: 'by price')
 
       within '#budget-investments' do
         expect(high_investment.title).to appear_before(mid_investment.title)
diff --git a/spec/features/budgets/results_spec.rb b/spec/features/budgets/results_spec.rb
index 3eb349df0..31c00a0a1 100644
--- a/spec/features/budgets/results_spec.rb
+++ b/spec/features/budgets/results_spec.rb
@@ -21,7 +21,7 @@ feature 'Results' do
     visit budget_path(budget)
     click_link "See results"
 
-    expect(page).to have_selector('a.active', text: budget.headings.first.name)
+    expect(page).to have_selector('a.is-active', text: budget.headings.first.name)
 
     within("#budget-investments-compatible") do
       expect(page).to have_content investment1.title
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index a0e1c1c5b..c4018ce76 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -365,7 +365,7 @@ feature 'Debates' do
       visit debates_path
       click_link 'highest rated'
 
-      expect(page).to have_selector('a.active', text: 'highest rated')
+      expect(page).to have_selector('a.is-active', text: 'highest rated')
 
       within '#debates' do
         expect(best_debate.title).to appear_before(medium_debate.title)
@@ -384,7 +384,7 @@ feature 'Debates' do
       visit debates_path
       click_link 'newest'
 
-      expect(page).to have_selector('a.active', text: 'newest')
+      expect(page).to have_selector('a.is-active', text: 'newest')
 
       within '#debates' do
         expect(best_debate.title).to appear_before(medium_debate.title)
@@ -447,7 +447,7 @@ feature 'Debates' do
 
         click_link 'recommendations'
 
-        expect(page).to have_selector('a.active', text: 'recommendations')
+        expect(page).to have_selector('a.is-active', text: 'recommendations')
 
         within '#debates' do
           expect(best_debate.title).to appear_before(medium_debate.title)
@@ -837,7 +837,7 @@ feature 'Debates' do
       fill_in "search", with: "Show you got"
       click_button "Search"
 
-      expect(page).to have_selector("a.active", text: "relevance")
+      expect(page).to have_selector("a.is-active", text: "relevance")
 
       within("#debates") do
         expect(all(".debate")[0].text).to match "Show you got"
@@ -856,7 +856,7 @@ feature 'Debates' do
       fill_in "search", with: "Show you got"
       click_button "Search"
       click_link 'newest'
-      expect(page).to have_selector("a.active", text: "newest")
+      expect(page).to have_selector("a.is-active", text: "newest")
 
       within("#debates") do
         expect(all(".debate")[0].text).to match "Show you got"
@@ -881,7 +881,7 @@ feature 'Debates' do
       fill_in "search", with: "Show you got"
       click_button "Search"
       click_link 'recommendations'
-      expect(page).to have_selector("a.active", text: "recommendations")
+      expect(page).to have_selector("a.is-active", text: "recommendations")
 
       within("#debates") do
         expect(all(".debate")[0].text).to match "Show you got"
diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb
index d9841a160..4d009bfbc 100644
--- a/spec/features/emails_spec.rb
+++ b/spec/features/emails_spec.rb
@@ -336,7 +336,7 @@ feature 'Emails' do
       visit new_management_user_invite_path
 
       fill_in "emails", with: " john@example.com, ana@example.com,isable@example.com "
-      click_button "Send invites"
+      click_button "Send invitations"
 
       expect(page).to have_content "3 invitations have been sent."
 
diff --git a/spec/features/legislation/questions_spec.rb b/spec/features/legislation/questions_spec.rb
index 42e731fbf..d871d120b 100644
--- a/spec/features/legislation/questions_spec.rb
+++ b/spec/features/legislation/questions_spec.rb
@@ -77,7 +77,7 @@ feature 'Legislation' do
       choose("I don't know")
       click_button "Submit answer"
 
-      within(:css, "label.active") do
+      within(:css, "label.is-active") do
         expect(page).to have_content("I don't know")
         expect(page).not_to have_content("Yes")
         expect(page).not_to have_content("No")
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index 2fcb6a17e..ce5987532 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -688,7 +688,7 @@ feature 'Proposals' do
 
       visit proposals_path
       click_link 'highest rated'
-      expect(page).to have_selector('a.active', text: 'highest rated')
+      expect(page).to have_selector('a.is-active', text: 'highest rated')
 
       within '#proposals' do
         expect(best_proposal.title).to appear_before(medium_proposal.title)
@@ -708,7 +708,7 @@ feature 'Proposals' do
 
       visit proposals_path
       click_link 'newest'
-      expect(page).to have_selector('a.active', text: 'newest')
+      expect(page).to have_selector('a.is-active', text: 'newest')
 
       within '#proposals' do
         expect(best_proposal.title).to appear_before(medium_proposal.title)
@@ -771,7 +771,7 @@ feature 'Proposals' do
 
         click_link 'recommendations'
 
-        expect(page).to have_selector('a.active', text: 'recommendations')
+        expect(page).to have_selector('a.is-active', text: 'recommendations')
 
         within '#proposals-list' do
           expect(best_proposal.title).to appear_before(medium_proposal.title)
@@ -1288,7 +1288,7 @@ feature 'Proposals' do
       fill_in "search", with: "Show what you got"
       click_button "Search"
 
-      expect(page).to have_selector("a.active", text: "relevance")
+      expect(page).to have_selector("a.is-active", text: "relevance")
 
       within("#proposals") do
         expect(all(".proposal")[0].text).to match "Show what you got"
@@ -1307,7 +1307,7 @@ feature 'Proposals' do
       fill_in "search", with: "Show what you got"
       click_button "Search"
       click_link 'newest'
-      expect(page).to have_selector("a.active", text: "newest")
+      expect(page).to have_selector("a.is-active", text: "newest")
 
       within("#proposals") do
         expect(all(".proposal")[0].text).to match "Show you got"
@@ -1332,7 +1332,7 @@ feature 'Proposals' do
       fill_in "search", with: "Show you got"
       click_button "Search"
       click_link 'recommendations'
-      expect(page).to have_selector("a.active", text: "recommendations")
+      expect(page).to have_selector("a.is-active", text: "recommendations")
 
       within("#proposals") do
         expect(all(".proposal")[0].text).to match "Show you got"
diff --git a/spec/features/user_invites_spec.rb b/spec/features/user_invites_spec.rb
index 5627b0b7e..81c02f5cc 100644
--- a/spec/features/user_invites_spec.rb
+++ b/spec/features/user_invites_spec.rb
@@ -10,7 +10,7 @@ feature 'User invites' do
     visit new_management_user_invite_path
 
     fill_in "emails", with: "john@example.com, ana@example.com, isable@example.com"
-    click_button "Send invites"
+    click_button "Send invitations"
 
     expect(page).to have_content "3 invitations have been sent."
   end
diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb
index 951fa37c5..f46d5850d 100644
--- a/spec/features/users_spec.rb
+++ b/spec/features/users_spec.rb
@@ -440,7 +440,7 @@ feature 'Users' do
 
       visit user_path(@user, filter: "follows")
 
-      expect(page).to have_selector(".activity li.active", text: "1 Following")
+      expect(page).to have_selector(".activity li.is-active", text: "1 Following")
     end
 
     describe 'Proposals' do
diff --git a/spec/models/signature_sheet_spec.rb b/spec/models/signature_sheet_spec.rb
index e573d8259..f64cac6e6 100644
--- a/spec/models/signature_sheet_spec.rb
+++ b/spec/models/signature_sheet_spec.rb
@@ -51,7 +51,7 @@ describe SignatureSheet do
       spending_proposal = create(:spending_proposal)
       signature_sheet.signable = spending_proposal
 
-      expect(signature_sheet.name).to eq("Spending proposal #{spending_proposal.id}")
+      expect(signature_sheet.name).to eq("Investment project #{spending_proposal.id}")
     end
 
     it "returns name for budget investment signature sheets" do
@@ -92,4 +92,4 @@ describe SignatureSheet do
     end
   end
 
-end
\ No newline at end of file
+end