diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot
index 031a51268..a876f3ced 100644
Binary files a/app/assets/fonts/icons.eot and b/app/assets/fonts/icons.eot differ
diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg
index eb3464e6c..6753ba685 100644
--- a/app/assets/fonts/icons.svg
+++ b/app/assets/fonts/icons.svg
@@ -36,4 +36,5 @@
 <glyph unicode="&#65;" d="M292 353l74 0-9-81-65 0 0-235-97 0 0 235-49 0 0 81 49 0 0 49c0 35 8 61 24 79 17 18 44 26 81 26l65 0 0-81-40 0c-8 0-14 0-18-2-5-1-8-3-10-6-2-4-3-7-4-10 0-3-1-8-1-14z"/>
 <glyph unicode="&#66;" d="M269 93c0 4-1 8-2 12-1 4-1 7-2 10-1 3-3 7-5 10-3 4-5 6-6 9-2 2-5 5-8 8-3 4-6 6-8 8-2 1-5 4-9 7-4 3-7 5-9 6-1 2-5 4-9 7-5 3-8 5-9 6-3 0-8 1-14 1-11 0-21-1-31-2-9-2-20-4-30-8-11-3-20-7-28-13-8-5-15-12-20-21-5-9-8-19-8-31 0-13 4-24 10-34 7-11 16-19 27-24 11-6 22-11 34-13 12-3 24-5 37-5 11 0 22 1 32 4 10 2 19 6 28 11 9 5 16 12 22 21 5 9 8 19 8 31z m-35 247c0 11-1 23-4 36-4 13-8 25-14 37-6 12-14 22-24 30-10 8-21 12-34 12-18 0-31-7-41-20-10-13-15-29-15-47 0-9 1-18 4-28 2-10 5-20 10-30 4-10 10-19 16-27 6-8 13-14 22-19 9-5 18-7 28-7 18 0 32 5 40 17 8 11 12 27 12 46z m-37 135l125 0-39-22-38 0c13-9 24-21 31-36 7-16 11-32 11-48 0-15-2-27-6-38-5-11-10-20-16-26-7-7-13-13-19-19-7-5-12-11-16-17-5-6-7-13-7-20 0-5 2-9 5-14 3-5 7-9 12-14 5-4 11-9 17-14 6-4 12-10 18-15 6-6 12-13 17-19 5-7 9-15 12-25 3-9 5-19 5-30 0-30-13-57-40-81-29-25-69-37-120-37-11 0-23 1-34 3-12 2-23 5-35 9-12 5-22 10-31 17-9 7-16 15-22 25-6 11-9 22-9 35 0 12 4 25 11 39 6 12 15 22 27 31 12 9 26 16 42 21 15 4 30 8 44 10 14 2 28 3 43 4-12 16-18 30-18 42 0 3 0 5 0 7 1 2 1 4 2 6 0 1 1 3 2 6 1 2 1 4 2 6-8-1-14-2-20-2-29 0-53 10-73 28-20 19-31 43-31 71 0 26 9 50 28 71 18 21 40 35 66 41 18 4 36 5 54 5z m297-73l0-36-73 0 0-73-37 0 0 73-73 0 0 36 73 0 0 73 37 0 0-73z"/>
 <glyph unicode="&#67;" d="M256 475c40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110 0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29z m78-148c0-1-1-2-2-3-2-2-3-3-4-3 0 0 1 1 1 2 0 1 1 2 1 3 1 1 1 2 1 2 2 1 4 2 7 4 2 1 7 2 15 3 6 2 11 1 14-3 0 1 1 2 3 4 2 2 3 3 4 3 1 1 2 1 4 2 3 0 4 1 5 2l0 6c-2 0-4 1-5 2-1 2-2 4-2 6 0 0 0-1-1-2 0 1-1 2-2 2-1 0-2 0-3 0-1-1-2-1-3 0-1 0-3 1-4 2-1 1-2 2-2 4-1 3-1 4-1 5-1 1-2 2-3 3-1 1-2 2-3 3 0 0 0 1 0 1-1 1-1 2-1 2-1 1-1 1-1 2-1 0-1 0-2 0-1 0-1 0-2-1-1-1-1-2-2-3-1-1-1-1-1-1-1 0-2 0-2 0-1 0-1 0-1 0-1 0-1-1-2-1 0 0-1-1-1-1-1 0-2-1-3-1-1 0-1 0-2 0 3 1 3 2 0 3-2 0-4 1-5 1 2 0 3 1 2 3 0 2-1 3-2 4l1 0c0 1-1 2-2 2-2 1-3 2-5 3-2 1-3 1-4 2-1 1-5 1-10 2-5 1-8 1-9 0-1-1-1-2-1-3 0 0 0-2 1-4 1-1 1-3 1-3 0-1 0-3-2-4-1-1-2-2-2-3 0-2 2-3 4-5 3-1 4-3 3-6 0-1-2-3-4-4-3-2-4-3-5-4-1-1-1-3 0-5 0-2 1-4 3-5 0 0 0-1 0-1 0 0 0-1-1-1 0-1-1-1-1-1-1-1-2-1-2-1l-1-1c-2-1-4 0-6 2-2 2-3 4-4 7-1 5-3 8-4 9-5 1-8 1-9-1-1 3-5 5-11 8-5 2-11 2-17 1 1 0 1 2 0 4-1 3-3 4-5 4 0 1 1 3 1 5 0 2 0 3 0 4 1 2 2 4 3 6 1 0 1 1 2 3 2 1 2 2 3 3 1 2 1 2 0 2 7-1 12 0 15 3 1 1 2 3 3 5 1 2 2 4 3 5 2 1 3 2 4 2 1-1 2-1 4-2 2-1 3-1 4-1 3-1 4 0 5 3 0 2-1 4-3 5 3 0 3 2 1 5-1 2-1 2-2 3-2 1-5 0-8-2-1 0-1-1 1-2 0 0-1-1-3-3-1-2-3-4-5-5-1-1-3-1-4 2 0 0-1 1-2 3-1 3-1 4-2 4-2 0-3-1-5-4 1 2 0 3-3 4-3 2-5 2-7 3 4 2 3 4-2 7-2 1-4 2-6 2-3 0-5 0-6-1-1-2-1-3-1-4 0-1 0-1 1-2 1-1 2-1 3-2 1 0 2 0 3-1 2 0 2 0 3-1 3-1 3-3 2-4 0 0-1 0-2-1-2 0-3 0-4-1-1 0-1-1-1-1-1-1-1-2 0-4 0-2 0-3-1-4-1 1-2 3-2 5-1 2-2 4-2 5 1-2-1-3-8-2l-2 0c-1 0-3 0-5 0-2-1-4-1-6-1-1 1-3 1-4 3 0 1 0 3 0 5 0 1 1 1 1 1 0 1-1 1-3 3-1 1-2 2-3 2-8-3-17-7-26-12 1 0 2 0 3 1 1 0 2 1 4 2 1 0 2 1 3 1 6 3 10 3 12 2l1 2c3-3 5-6 6-8-2 1-4 1-9 1-4-1-6-3-6-4 1-2 2-4 1-5 0 1-2 2-3 3-1 1-3 2-4 3-1 1-3 1-4 2-3 0-6-1-7-1-28-15-50-36-67-63 1-1 3-2 4-2 0-1 1-1 1-3 0-2 0-3 1-3 0-1 1 0 3 1 2-2 2-4 1-6 0 0 4-2 12-7 4-4 6-6 6-6 1-3 0-4-2-6-1 1-1 2-3 3-2 1-2 2-3 1 0-1 0-3 1-5 0-3 1-4 3-4-2 0-3-1-3-4-1-3-1-7-1-10 0-4 0-6 0-7l0 0c0-3 0-6 2-10 2-5 4-6 6-6-2 0 0-5 6-12 1-2 2-3 2-3 1 0 2-1 4-2 1-1 3-2 4-3 1-1 2-2 3-3 0-1 1-3 3-6 1-3 2-6 4-7-1-1 0-3 2-6 2-2 3-4 3-6 0 0 0 0 0 0-1-1-1-1-1-1 0-1 2-2 4-4 3-1 4-2 5-3 0-1 0-2 0-3 0-2 1-3 1-3 1-1 1-1 2-1 1 4-1 10-6 18-3 4-5 7-5 8-1 1-1 2-2 4 0 2-1 4-1 5 0 0 1-1 2-1 0 0 1 0 2-1 1 0 2-1 2-1 1 0 1-1 1-1-1-1-1-3 0-5 1-2 2-4 4-5 1-2 3-3 5-6 1-2 3-3 3-3 1-1 2-3 4-6 2-2 2-4 0-4 2 0 4-1 6-3 2-1 3-3 5-5 1-2 1-4 2-8 0-3 1-5 1-7 1-1 1-2 3-3 1-2 2-3 3-3l5-2c0 0 1-1 4-2 1-1 2-2 5-3 2-2 4-3 6-4 2 0 3-1 5-1 1 0 2 0 4 1 1 0 3 1 4 1 2 0 5-1 8-4 3-4 5-6 6-6 7-4 12-5 16-4-1 0-1 0 0-2 0-1 1-2 2-4 1-2 2-3 3-4 0-1 1-2 1-3 1-1 3-2 5-4 3-2 4-3 5-4 2 0 2 1 2 2 0-1 1-3 2-5 2-3 4-4 6-3 2 0 4 3 4 9-6-3-11-1-14 5 0 0-1 1-1 2-1 0-1 1-1 2-1 1-1 2-1 2 0 1 0 2 0 3 0 0 1 0 1 0 2 0 3 1 3 1 0 1 0 2 0 4-1 2-1 3-1 4-1 1-2 3-4 5-1 3-3 4-3 5-1-2-2-3-5-3-2 1-3 1-4 3 0 0 0-1-1-2 0 0 0-1 0-1-2 0-4 0-4 0 0 0 0 2 0 5 1 3 1 5 1 6 1 1 1 2 2 4 1 1 2 3 2 4 1 1 1 2 1 3 0 2 0 2-1 3-1 1-3 1-5 1-4 0-6-2-7-6-1 0-1-1-1-3-1-1-1-2-2-3 0-1-1-2-2-2-2-1-4-1-7-1-3 0-6 1-7 2-2 1-5 4-6 8-2 4-3 8-3 11 0 1 0 4 1 7 0 3 0 6 0 7 1 2 0 4-1 7 0 1 1 2 2 3 2 1 3 2 3 3 1 0 1 0 2 0 0 1 0 1 1 0 0 0 1 0 1 1 0 0 1 1 1 2 0 0-1 0-1 0-1 1-1 1-1 1 1 0 4 0 8 1 4 1 6 0 8-1 2-2 5-2 6 1 0 0 0 1-1 3 0 1 0 2 0 3 1-5 4-6 8-2 1-1 2-1 5-2 2 0 4 0 5-1 0 0 1-1 2-2 0 0 1-1 1-1 1 0 1 0 2 0 0 1 1 1 2 2 2-3 3-5 4-7 2-7 3-12 5-12 1-1 2-1 3-1 1 0 1 1 1 3 1 1 1 3 0 4 0 1 0 2 0 3l0 3 0 5-1 2c-2 1-4 2-5 4-1 1 0 3 1 5 1 2 2 3 4 5 0 0 1 1 2 1 1 1 3 1 5 2 1 1 2 2 3 2 4 4 6 7 4 10 2 0 3 1 4 3-1 0-1 0-2 1-1 0-1 1-2 1-1 1-1 1-1 1 1 1 2 2 0 4 1 1 2 2 2 3 1 2 2 3 3 3 1-2 3-2 6 0 1 1 1 3 0 4 1 2 3 3 6 3 3 1 4 2 5 3 1 0 2 0 2 1 0 0 1 1 1 3 0 2 0 3 0 3 1 1 3 2 5 3 2 1 3 1 3 1l5 4c1 0 1 1 0 1 4-1 7 0 9 3 2 2 1 4-2 6 1 1 1 2 0 2-2 1-3 1-5 2 1 0 2 0 4 0 1 0 2 0 3 0 2 2 2 4-2 5-4 1-8 0-13-3z m-46-251c39 7 72 25 100 54-1 1-2 1-4 1-1 1-3 1-3 1-4 2-6 2-7 3 0 1 0 2-1 3 0 1-1 2-2 3-1 0-2 1-4 2-1 1-2 2-3 2 0 1-1 1-2 2-1 1-1 1-2 1 0 1-1 1-2 2-1 0-2 0-2 0-1 0-2 0-3 0l-1 0c-1 0-1-1-2-1 0 0-1-1-1-1-1 0-1 0-1-1 0 0 0 0 0 0-4 3-8 5-11 6-1 0-2 1-3 1-1 1-2 2-3 2-1 1-2 1-3 1-1 0-2-1-3-2-1-1-1-3-2-4 0-2 0-4 0-4-1 1-1 2 0 5 1 2 1 4 0 5 0 1-1 2-3 1-1 0-2 0-3-1-1 0-2-1-3-2-2-1-2-2-3-2 0 0-1-1-2-2-2-1-2-1-3-2 0-1-1-2-1-3-1-2-1-3-2-3 0 0-1 1-3 1-2 1-3 1-3 2 1-2 1-5 1-10 1-5 1-8 2-11 1-6 0-10-4-14-5-4-8-8-8-11-1-4 0-7 3-7 0-2 0-4-2-6-1-3-2-5-2-6 0-2 0-3 1-5z"/>
+<glyph unicode="&#68;" d="M487 375c7-10 9-23 5-36l-79-259c-3-12-11-23-22-31-11-8-22-12-35-12l-263 0c-15 0-29 5-43 15-13 10-23 23-28 37-5 13-5 25-1 37 0 0 0 3 1 7 1 5 1 8 1 11 0 2 0 4-1 6 0 3-1 5-1 6 1 2 2 4 3 6 1 2 2 4 4 6 2 3 4 5 5 7 5 7 9 16 13 26 4 10 7 19 9 26 0 2 0 5 0 9-1 4-1 6 0 8 0 2 2 5 4 8 3 3 5 5 5 7 4 6 8 15 12 26 4 11 7 19 7 26 1 1 0 4 0 9-1 4-1 7 0 8 1 2 3 5 6 8 4 4 6 6 6 7 4 5 8 13 13 24 4 11 7 20 7 28 1 1 0 4 0 7-1 3-1 6-1 7 0 2 1 4 3 6 1 1 3 4 5 6 2 3 3 5 5 6 1 2 3 5 4 9 2 3 3 7 5 10 1 3 2 6 4 10 2 4 4 7 6 9 2 3 4 5 7 7 3 2 7 3 11 3 3 0 8 0 13-1l0-1c7 2 12 2 14 2l218 0c14 0 25-5 32-16 8-10 10-23 6-37l-79-259c-7-22-13-37-20-43-7-7-19-10-37-10l-248 0c-5 0-9-2-11-5-2-3-2-7 0-12 4-13 18-20 41-20l264 0c5 0 10 2 16 5 5 3 8 6 10 11l85 282c2 5 2 10 2 17 7-3 13-7 17-13z m-304 0c-1-3-1-5 0-7 1-1 3-2 6-2l174 0c2 0 4 1 7 2 2 2 4 4 5 7l6 18c0 3 0 5-1 7-1 1-3 2-6 2l-173 0c-3 0-5-1-8-2-2-2-4-4-4-7z m-24-73c-1-3-1-5 0-7 2-2 3-2 6-2l174 0c2 0 5 0 7 2 3 2 4 4 5 7l6 18c1 2 0 5-1 6-1 2-3 3-5 3l-174 0c-3 0-5-1-7-3-3-1-4-4-5-6z"/>
 </font></defs></svg>
diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf
index d40402b21..e052053e7 100644
Binary files a/app/assets/fonts/icons.ttf and b/app/assets/fonts/icons.ttf differ
diff --git a/app/assets/fonts/icons.woff b/app/assets/fonts/icons.woff
index 9cfd1b210..37e8833db 100644
Binary files a/app/assets/fonts/icons.woff and b/app/assets/fonts/icons.woff differ
diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss
index 2fe4a8383..518ccf5b1 100644
--- a/app/assets/stylesheets/debates.scss
+++ b/app/assets/stylesheets/debates.scss
@@ -383,6 +383,16 @@
     .anonymous-votes, .organizations-votes {
       padding-top: rem-calc(24);
     }
+
+    .divider {
+      display: none;
+    }
+
+    @media (min-width: $medium-breakpoint) {
+      .divider {
+        display: inline-block;
+      }
+    }
   }
 }
 
@@ -463,6 +473,23 @@
       line-height: $line-height;
       padding: rem-calc(24);
     }
+
+    @media (min-width: $small-breakpoint  + em-calc(1)) and (max-width:$medium-breakpoint) {
+      .in-favor, .against {
+        text-align: left;
+        width: rem-calc(100);
+      }
+    }
+
+    .divider {
+      display: none;
+    }
+
+    @media (min-width: $medium-breakpoint) {
+      .divider {
+        display: inline-block;
+      }
+    }
   }
 
   .leave-comment {
@@ -536,6 +563,10 @@
   }
 }
 
+.debate-edit {
+  @extend .debate-new;
+}
+
 // 05. Comments
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss
index 5a06bcc1d..1fe6915ee 100644
--- a/app/assets/stylesheets/icons.scss
+++ b/app/assets/stylesheets/icons.scss
@@ -124,3 +124,6 @@
 .icon-language:before {
   content: "C";
 }
+.icon-book:before {
+  content: "D";
+}
diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss
index bd8759c98..d272042df 100644
--- a/app/assets/stylesheets/participacion.scss
+++ b/app/assets/stylesheets/participacion.scss
@@ -460,7 +460,10 @@ header {
 
       &:hover {
         background: none;
-        color: $link-hover;
+        // color: $link-hover;
+        color: white;
+        text-decoration: underline;
+        transition: text-decoration 275ms;
       }
     }
 
@@ -488,6 +491,10 @@ header {
 
   a {
     color: white;
+
+    &:hover {
+      text-decoration: underline;
+    }
   }
 }
 
@@ -502,7 +509,15 @@ header {
 
   a {
     color: $link;
+    display: inline-block;
     font-size: rem-calc(14);
+    min-width: rem-calc(192);
+    position: relative;
+
+    &:hover {
+      color: $text;
+      text-decoration: underline;
+    }
 
     &.active {
       color: $text;
@@ -745,8 +760,7 @@ form {
   }
 
   .ckeditor {
-    margin-bottom: rem-calc(24);
-    min-height: rem-calc(336);
+    min-height: rem-calc(312);
   }
 
   .checkbox {
@@ -1172,6 +1186,53 @@ table {
       }
     }
   }
+
+  .more-information {
+    margin-top: rem-calc(24);
+
+    ul {
+      list-style-type: none;
+      margin-left: 0;
+
+      a:first-child {
+        border-top: 1px solid $border;
+        display: block;
+        padding-top: rem-calc(12);
+      }
+
+      li {
+        border-bottom: 1px solid $border;
+        font-size: rem-calc(16);
+        padding-bottom: rem-calc(12);
+        padding-left: rem-calc(36);
+        position: relative;
+
+        span {
+          color: $text-medium;
+          display: block;
+          font-size: rem-calc(13);
+        }
+
+        &:before {
+          content: 'D';
+          color: $link;
+          font-family: "icons" !important;
+          left: 0;
+          margin-right: rem-calc(12);
+          position: absolute;
+        }
+
+        &:after {
+          content: 'c';
+          color: $text-light;
+          font-family: "icons" !important;
+          position: absolute;
+          right: 0;
+          top: rem-calc(6);
+        }
+      }
+    }
+  }
 }
 
 // 17. Verification
@@ -1259,6 +1320,7 @@ table {
 
     span {
       display: inline-block;
+      min-width: rem-calc(288);
     }
   }
 }
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 33fc7e0fa..57c81b4d6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -11,8 +11,16 @@ module ApplicationHelper
     request.path == '/'
   end
 
+  def transparency_page?
+    request.path == '/transparency'
+  end
+
+  def opendata_page?
+    request.path == '/opendata'
+  end
+
   def header_css
-    home_page? ? '' : 'results'
+    home_page? || transparency_page? || opendata_page? ? '' : 'results'
   end
 
   # if current path is /debates current_path_with_query_params(foo: 'bar') returns /debates?foo=bar
diff --git a/app/views/debates/_form.html.erb b/app/views/debates/_form.html.erb
index dd4ed2e29..334c444cf 100644
--- a/app/views/debates/_form.html.erb
+++ b/app/views/debates/_form.html.erb
@@ -34,7 +34,7 @@
     </div>
 
     <div class="actions small-12 column">
-      <%= f.submit(class: "button radius", value: t("debates.form.start_debate")) %>
+      <%= f.submit(class: "button radius", value: t("debates.#{action_name}.form.submit_button")) %>
     </div>
   </div>
 <% end %>
diff --git a/app/views/debates/edit.html.erb b/app/views/debates/edit.html.erb
index dc90707b2..45499263f 100644
--- a/app/views/debates/edit.html.erb
+++ b/app/views/debates/edit.html.erb
@@ -1,6 +1,17 @@
-<h1><%= t("debates.edit.editing") %></h1>
+<div class="debate-edit row">
 
-<%= render 'form' %>
+  <div class="small-12 column">
+    <%= link_to debates_path, class: "left back clear" do %>
+      <i class="icon-angle-left left"></i>
+      <%= t("debates.edit.back_link") %>
+    <% end %>
 
-<%= link_to t("debates.edit.show_link"), @debate %> |
-<%= link_to t("debates.edit.back_link"), debates_path %>
+    <div class="right">
+      <%= link_to t("debates.edit.show_link"), @debate %>
+    </div>
+
+    <h1><%= t("debates.edit.editing") %></h1>
+
+    <%= render "form" %>
+  </div>
+</div>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index f651ea3f1..0e72ed0d2 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -27,22 +27,12 @@
         <%= render "shared/admin_login_items" %>
       </section>
 
-      <section class="subnavigation row">
-        <!-- <div class="small-12 medium-2 medium-offset-1 column end">
-          <%#= link_to t("layouts.header.welcome"), root_path %>
-        </div> -->
-        <div class="small-12 medium-2 column end">
-          <%= link_to t("layouts.header.debates"), debates_path, class: ("active" if current_page?(controller: "/debates")) %>
-        </div>
-        <!-- <div class="small-12 medium-2 column end">
-          <%#= link_to t("layouts.header.initiatives"), "#" %>
-        </div> -->
-        <div class="small-12 medium-2 column end">
-          <%= link_to t("layouts.header.more_information"), "/more_information" %>
-        </div>
-        <div class="small-12 medium-2 column end">
-          <%= link_to t("layouts.header.external_link_blog"), t("layouts.header.external_link_blog_url"), target: "_blank" %>
-        </div>
+      <section class="subnavigation row text-center">
+        <%#= link_to t("layouts.header.welcome"), root_path %>
+        <%= link_to t("layouts.header.debates"), debates_path, class: ("active" if current_page?(controller: "/debates")) %>
+        <%#= link_to t("layouts.header.initiatives"), "#" %>
+        <%= link_to t("layouts.header.more_information"), "/more_information", class: ("active" if current_page?("/more_information"))  %>
+        <%= link_to t("layouts.header.external_link_blog"), t("layouts.header.external_link_blog_url"), target: "_blank" %>
       </section>
     </nav>
   </div>
@@ -62,4 +52,37 @@
       </div>
     </div>
   <% end %>
+
+  <% if transparency_page? %>
+    <div class="row home-page">
+      <div class="small-12 column text-center">
+        <h1><%= t("pages.transparency") %></h1>
+
+      <div class="small-12 medium-10 column small-centered">
+        <p>Estamos trabajando en el nuevo Portal de Transparencia del Ayuntamiento de Madrid, para que no quede ni una esquina del Ayuntamiento que no puedas ver.</p>
+
+        <p>Por ahora puedes visitar el portal que existía hasta ahora:</p>
+
+        <%= link_to "Ir al Portal de Transparencia existente anteriormente", t("layouts.header.external_link_transparency_url"), target: "_blank", class: "button radius" %>
+
+        <p>Mientras acabamos el nuevo portal, te invitamos a visitar el <a href="http://diario.madrid.es/participa/" target="_blank">blog del Área de Participación Ciudadana, Transparencia y Gobierno Abierto</a> para conocer nuestros avances y novedades; o la <a href="/">sección de Participación Ciudadana</a> donde poder decidir qué ciudad es la que quieres.</p>
+      </div>
+      </div>
+    </div>
+  <% end %>
+
+  <% if opendata_page? %>
+    <div class="row home-page">
+      <div class="small-12 column text-center">
+        <h1><%= t("pages.opendata") %></h1>
+
+      <div class="small-12 medium-10 column small-centered">
+       <p>Estamos trabajando en el nuevo Portal de Datos Abiertos de Ayuntamiento de Madrid, para que puedas reutilizar todos los datos de Ayuntamiento como quieras. Por ahora puedes visitar el portal qu existía hasta ahora:</p>
+
+        <%= link_to "Ir al Portal de Datos Abiertos existente anteriormente", t("layouts.header.external_link_opendata_url"), target: "_blank", class: "button radius" %>
+
+        <p>Mientras acabamos el nuevo portal, te invitamos a visitar el <a href="http://diario.madrid.es/participa/" target="_blank">blog del Área de Participación Ciudadana, Transparencia y Gobierno Abierto</a> para conocer nuestros avances y novedades; o la <a href="/">sección de Participación Ciudadana</a> donde poder decidir qué ciudad es la que quieres.</p>
+      </div>
+    </div>
+  <% end %>
 </header>
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index 91f31ab18..4372c2eba 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -31,9 +31,9 @@
     <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;">
-          <a href="#" style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;margin: 0;padding: 0;color: #398fd1;text-decoration: none;">Preguntas frecuentes</a>&nbsp;<span style="color:#398fd1;">&bullet;</span>&nbsp;<a href="mailto:#" style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;margin: 0;padding: 0;color: #398fd1;text-decoration: none;">tec.gobiernoabierto@madrid.es</a></p>
+          <a href="mailto:web.gobiernoabierto@madrid.es" style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;margin: 0;padding: 0;color: #398fd1;text-decoration: none;">web.gobiernoabierto@madrid.es</a></p>
         <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; margin: 0;padding: 0;line-height: 1.5em;color: #797f7f; font-size: 12px;">
-        &copy; 2015 Ayuntamiento de Madrid</p>
+        Ayuntamiento de Madrid</p>
       </td>
     </tr>
     </tbody>
diff --git a/app/views/mailer/email_verification.html.erb b/app/views/mailer/email_verification.html.erb
index a57a5b0dc..e86e7b7ce 100644
--- a/app/views/mailer/email_verification.html.erb
+++ b/app/views/mailer/email_verification.html.erb
@@ -1,5 +1,4 @@
 <td style="padding-bottom: 20px; padding-left: 10px;">
-
   <h1 style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;">
     <%= t("mailers.email_verification.title") %>
   </h1>
@@ -10,6 +9,7 @@
           t('mailers.email_verification.click_here_to_verify'),
           email_url(email_verification_token: @token))) %>
   </p>
-
+  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
+    <%= t("mailers.email_verification.thanks") %>
+  </p>
 </td>
-
diff --git a/app/views/pages/more_information.html.erb b/app/views/pages/more_information.html.erb
index f20dad05d..12bf34085 100644
--- a/app/views/pages/more_information.html.erb
+++ b/app/views/pages/more_information.html.erb
@@ -1,12 +1,32 @@
 <div class="page row-full">
   <div class="row">
-    <div class="text small-12 column">
+    <div class="more-information text small-12 medium-8">
       <h1>Más información</h1>
       <ul>
-        <li><a href="/how_it_works">¿Cómo funciona este Portal de Gobierno Abierto?</a></li>
-        <li><a href="/how_to_use">Utilízalo en tu municipio libremente o ayúdanos a mejorarlo, es software libre</a></li>
-        <li><a href="/coming_soon">Próximas novedades</a></li>
-        <li><a href="/participation">El Área de Gobierno de Participación Ciudadana, Transparencia y Gobierno Abierto</a></li>
+        <a href="/how_it_works">
+          <li>
+            ¿Cómo funciona este Portal de Gobierno Abierto?
+            <span>Descubre todo lo que puedes hacer en esta web</span>
+          </li>
+        </a>
+        <a href="/how_to_use">
+          <li>
+            Utilízalo en tu municipio
+            <span>Utilízalo libremente o ayúdanos a mejorarlo, es software libre</span>
+          </li>
+        </a>
+        <a href="/coming_soon">
+          <li>
+            Próximas novedades
+            <span>Seguimos trabajando para los ciudadanos</span>
+          </li>
+        </a>
+        <a href="/participation">
+          <li>
+            El Área de Gobierno
+            <span>Participación Ciudadana, Transparencia y Gobierno Abierto</span>
+          </li>
+        </a>
       </ul>
     </div>
   </div>
diff --git a/app/views/pages/opendata.html.erb b/app/views/pages/opendata.html.erb
index b806aeaa7..e69de29bb 100644
--- a/app/views/pages/opendata.html.erb
+++ b/app/views/pages/opendata.html.erb
@@ -1,13 +0,0 @@
-<div class="row-full page">
-  <div class="row">
-    <div class="small-12 medium-10 column text-center">
-      <h1><%= t('pages.opendata') %></h1>
-
-      <p>Estamos trabajando en el nuevo Portal de Datos Abiertos de Ayuntamiento de Madrid, para que puedas reutilizar todos los datos de Ayuntamiento como quieras. Por ahora puedes visitar el portal qu existía hasta ahora:</p>
-
-      <%= link_to "Ir al Portal de Datos Abiertos existente anteriormente", t("layouts.header.external_link_opendata_url"), target: "_blank", class: "button radius" %>
-
-      <p>Mientras acabamos el nuevo portal, te invitamos a visitar el <a href="http://diario.madrid.es/participa/" target="_blank">blog del Área de Participación Ciudadana, Transparencia y Gobierno Abierto</a> para conocer nuestros avances y novedades; o la <a href="/">sección de Participación Ciudadana</a> donde poder decidir qué ciudad es la que quieres.</p>
-    </div>
-  </div>
-</div>
diff --git a/app/views/pages/transparency.html.erb b/app/views/pages/transparency.html.erb
index 8eae961f8..e69de29bb 100644
--- a/app/views/pages/transparency.html.erb
+++ b/app/views/pages/transparency.html.erb
@@ -1,13 +0,0 @@
-<div class="row-full page">
-  <div class="row">
-    <div class="small-12 medium-10 column text-center">
-      <h1><%= t('pages.transparency') %></h1>
-
-      <p>Estamos trabajando en el nuevo Portal de Transparencia del Ayuntamiento de Madrid, para que no quede ni una esquina del Ayuntamiento que no puedas ver. Por ahora puedes visitar el portal que existía hasta ahora:</p>
-
-      <%= link_to "Ir al Portal de Transparencia existente anteriormente", t("layouts.header.external_link_transparency_url"), target: "_blank", class: "button radius" %>
-
-      <p>Mientras acabamos el nuevo portal, te invitamos a visitar el <a href="http://diario.madrid.es/participa/" target="_blank">blog del Área de Participación Ciudadana, Transparencia y Gobierno Abierto</a> para conocer nuestros avances y novedades; o la <a href="/">sección de Participación Ciudadana</a> donde poder decidir qué ciudad es la que quieres.</p>
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/app/views/welcome/_featured_debate.html.erb b/app/views/welcome/_featured_debate.html.erb
index 00fe7ce73..b364f875c 100644
--- a/app/views/welcome/_featured_debate.html.erb
+++ b/app/views/welcome/_featured_debate.html.erb
@@ -1,5 +1,5 @@
 <% cache [locale_and_user_status, featured_debate, 'featured'] do %>
-  <div class="small-12 medium-4 column">
+  <div class="small-12 medium-4 column end">
     <div id="<%= dom_id featured_debate %>" class="debate-featured">
       <div class="panel">
 
diff --git a/config/locales/devise_views.en.yml b/config/locales/devise_views.en.yml
index 9bb0cad79..9869804f2 100644
--- a/config/locales/devise_views.en.yml
+++ b/config/locales/devise_views.en.yml
@@ -6,7 +6,7 @@ en:
       submit: "Resend confirmation instructions"
     mailer:
       confirmation_instructions:
-        title: "Welcome to open government"
+        title: "Welcome to open government portal"
         welcome: "Welcome"
         text: "You can confirm your account email through the link below:"
         confirm_link: "Confirm my account"
diff --git a/config/locales/devise_views.es.yml b/config/locales/devise_views.es.yml
index a64ac018e..01753bdb6 100644
--- a/config/locales/devise_views.es.yml
+++ b/config/locales/devise_views.es.yml
@@ -6,16 +6,16 @@ es:
       submit: "Reenviar instrucciones de confirmación"
     mailer:
       confirmation_instructions:
-        title: "Bienvenido/a a gobierno abierto"
+        title: "Te damos la bienvenida al Portal de Gobierno Abierto del Ayuntamiento de Madrid"
         welcome: "Bienvenido/a"
         text: "Puedes confirmar tu cuenta de correo electrónico en el siguiente enlace:"
         confirm_link: "Confirmar mi cuenta"
       reset_password_instructions:
         hello: "Hola"
-        title: "Cambiar tu contraseña"
+        title: "Cambia tu contraseña"
         text: "Se ha solicitado cambiar tu contraseña, puedes hacerlo en el siguiente enlace:"
         change_link: "Cambiar mi contraseña"
-        ignore_text: "Si tu no lo has solicitado, puedes ignorar este email."
+        ignore_text: "Si tú no lo has solicitado, puedes ignorar este email."
         info_text: "Tu contraseña no cambiará hasta que no accedas al enlace y la modifiques."
       unlock_instructions:
         hello: "Hola"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f62323591..23c7a25e9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -105,9 +105,8 @@ en:
       tags_label: Topics
       tags_instructions: >
         Tag this debate. You can choose among our proposals on the list or add any other topic you want by
-        writing them separated by "," and then pressing "enter".
+        writing them separated by ",".
         Some suggestions:
-      start_debate: Start a debate
     show:
       back_link: Back
       author_deleted: Deleted user
@@ -123,6 +122,8 @@ en:
       editing: Edit debate
       show_link: Show debate
       back_link: Back
+      form:
+        submit_button: "Save changes"
     new:
       start_new: Start a debate
       back_link: Back
@@ -132,6 +133,14 @@ en:
       recommendation_three: "Any discussion or comment that involves an illegal act will be eliminated, also intending to sabotage the debate spaces, everything else is permitted."
       recommendation_four: "The harsh criticism are very welcome. This is a space of thought but we recommend preserving the elegance and intelligence. The world is better with them present."
       recommendation_five: "Enjoy this space, voices that fill it, it is yours too."
+      form:
+        submit_button: "Start a debate"
+    create:
+      form:
+        submit_button: "Start a debate"
+    update:
+      form:
+        submit_button: "Save changes"
   comments:
     form:
       leave_comment: Write a comment
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9ab30d2ef..0c400b4b0 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -105,9 +105,8 @@ es:
       tags_label: Temas
       tags_instructions: >
         Etiqueta este debate. Puedes elegir entre nuestras propuestas o introducir las que desees.
-        Para ello solo tienes que escribir las etiquetas que desees separadas por "," y pulsar "intro".
+        Para ello solo tienes que escribir las etiquetas que desees separadas por ",".
         Algunas recomendaciones:
-      start_debate: Empieza un debate
     show:
       back_link: Volver
       author_deleted: Usuario eliminado
@@ -123,6 +122,8 @@ es:
       editing: Editar debate
       show_link: Ver debate
       back_link: Volver
+      form:
+        submit_button: "Guardar cambios"
     new:
       start_new: Empezar un debate
       back_link: Volver
@@ -132,6 +133,14 @@ es:
       recommendation_three: "Cualquier debate o comentario que implique una acción ilegal será eliminado, también los que tengan la intención de sabotear los espacios de debate, todo lo demás está permitido."
       recommendation_four: "Las críticas despiadadas son muy bienvenidas. Este es un espacio de pensamiento. Pero te recomendamos conservar la elegancia y la inteligencia. El mundo es mejor con ellas presentes."
       recommendation_five: "Disfruta de este espacio, de las voces que lo llenan, también es tuyo."
+      form:
+        submit_button: "Empieza un debate"
+    create:
+      form:
+        submit_button: "Empieza un debate"
+    update:
+      form:
+        submit_button: "Guardar cambios"
   comments:
     form:
       leave_comment: Deja tu comentario
diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml
index 4e3eeeab3..c5aa00a97 100644
--- a/config/locales/mailers.en.yml
+++ b/config/locales/mailers.en.yml
@@ -12,4 +12,5 @@ en:
       title: Please verify yourself
       instructions_html: "We need to verify you using this email, which we got from the Census. %{verification_link}"
       click_here_to_verify: "Please click here to verify yourself"
+      thanks: "Thanks"
 
diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml
index a6491f032..9b37b2dd5 100644
--- a/config/locales/mailers.es.yml
+++ b/config/locales/mailers.es.yml
@@ -9,6 +9,7 @@ es:
       title: Nueva respuesta a tu comentario
       new_reply_by_html: "Hay una nueva respuesta de <b>%{commenter}</b> a tu comentario en"
     email_verification:
-      title: Por favor verifícate
-      instructions_html: "Vamos a proceder a verificar tu cuenta en la aplicación de participación ciudadana utilizando esta cuenta de correo que sacamos del padrón. %{verification_link}."
-      click_here_to_verify: "Por favor pulsa este enlace para verificarte"
+      title:  Verifica tu cuenta con el siguiente enlace
+      instructions_html: "Para terminar de verificar tu cuenta de usuario en el Portal de Gobierno Abierto del Ayuntamiento de Madrid, necesitamos que pulses %{verification_link}."
+      click_here_to_verify: "en este enlace"
+      thanks: "Muchas gracias."
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index 005232bb0..935da21f6 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -222,7 +222,7 @@ feature 'Debates' do
     fill_in 'debate_description', with: "Let's..."
     fill_in 'debate_captcha', with: correct_captcha_text
 
-    click_button "Start a debate"
+    click_button "Save changes"
 
     expect(page).to have_content "Debate was successfully updated."
     expect(page).to have_content "End child poverty"
@@ -235,7 +235,7 @@ feature 'Debates' do
 
     visit edit_debate_path(debate)
     fill_in 'debate_title', with: ""
-    click_button 'Start a debate'
+    click_button "Save changes"
 
     expect(page).to have_content error_message
   end
@@ -249,13 +249,13 @@ feature 'Debates' do
 
     fill_in 'debate_title', with: "New title"
     fill_in 'debate_captcha', with: "wrong!"
-    click_button "Start a debate"
+    click_button "Save changes"
 
     expect(page).to_not have_content "Debate was successfully updated."
     expect(page).to have_content "1 error"
 
     fill_in 'debate_captcha', with: correct_captcha_text
-    click_button "Start a debate"
+    click_button "Save changes"
 
     expect(page).to have_content "Debate was successfully updated."
   end
@@ -271,7 +271,7 @@ feature 'Debates' do
 
     fill_in 'debate_title', with: ""
     fill_in 'debate_captcha', with: correct_captcha_text
-    click_button "Start a debate"
+    click_button "Save changes"
 
     expect(page).to_not have_content "Debate was successfully updated."
     expect(page).to have_content "1 error"
diff --git a/spec/features/tags_spec.rb b/spec/features/tags_spec.rb
index 80106cf3b..1b47f87a1 100644
--- a/spec/features/tags_spec.rb
+++ b/spec/features/tags_spec.rb
@@ -90,7 +90,7 @@ feature 'Tags' do
 
     fill_in 'debate_tag_list', with: "Economía, Hacienda"
     fill_in 'debate_captcha', with: correct_captcha_text
-    click_button 'Start a debate'
+    click_button 'Save changes'
 
     expect(page).to have_content 'Debate was successfully updated.'
     within('.tags') do
@@ -107,7 +107,7 @@ feature 'Tags' do
 
     fill_in 'debate_tag_list', with: ""
     fill_in 'debate_captcha', with: correct_captcha_text
-    click_button 'Start a debate'
+    click_button 'Save changes'
 
     expect(page).to have_content 'Debate was successfully updated.'
     expect(page).to_not have_content 'Economía'