diff --git a/app/assets/javascripts/map.js.coffee b/app/assets/javascripts/map.js.coffee
index 797232c4f..28ac34f29 100644
--- a/app/assets/javascripts/map.js.coffee
+++ b/app/assets/javascripts/map.js.coffee
@@ -83,4 +83,4 @@ App.Map =
 
   toogleMap: ->
       $('.map').toggle()
-      $('.location-map-remove-marker-button').toggle()
\ No newline at end of file
+      $('.js-location-map-remove-marker').toggle()
\ No newline at end of file
diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index e47ba0343..854d6b1e6 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -22,6 +22,7 @@
 // 20. Documents
 // 21. Related content
 // 22. Images
+// 23. Maps
 //
 
 // 01. Global styles
@@ -2427,10 +2428,6 @@ table {
     margin-bottom: 0 !important;
     padding: $line-height / 2;
 
-    &:first-child {
-      border-top: 1px solid $border;
-    }
-
     @include breakpoint(medium) {
 
       .score-actions {
@@ -2439,6 +2436,10 @@ table {
       }
     }
 
+    &:first-child {
+      border-top: 1px solid $border;
+    }
+
     &:hover {
       background: #f9f9f9;
 
@@ -2478,8 +2479,8 @@ table {
     position: relative;
     text-decoration: none;
 
-    &.score-positive:before,
-    &.score-negative:before {
+    &.score-positive::before,
+    &.score-negative::before {
       font-family: 'icons';
       left: 0;
       position: absolute;
@@ -2488,7 +2489,7 @@ table {
     &.score-positive {
       color: $color-success;
 
-      &:before {
+      &::before {
         color: $color-success;
         content: '\6c';
       }
@@ -2497,7 +2498,7 @@ table {
     &.score-negative {
       color: $color-alert;
 
-      &:before {
+      &::before {
         color: $color-alert;
         content: '\76';
       }
@@ -2511,3 +2512,28 @@ table {
 .images .button {
   margin-top: $line-height / 2;
 }
+
+// 23. Maps
+// -----------------
+
+.location-map-remove-marker {
+  border-bottom: 1px dotted #cf2a0e;
+  color: $delete;
+  display: inline-block;
+  margin-top: $line-height / 2;
+
+  &:hover,
+  &:active,
+  &:focus {
+    border-bottom: 1px solid #cf2a0e;
+    color: #cf2a0e;
+    text-decoration: none;
+  }
+}
+
+.leaflet-bar a {
+
+  &.leaflet-disabled {
+    color: #525252 !important;
+  }
+}
diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index bc8633ec9..606de72f3 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -339,6 +339,7 @@
 .topic-show,
 .milestone-content {
 
+  h1,
   p {
     word-wrap: break-word;
   }
diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb
index ae45e7c1d..85b02e28c 100644
--- a/app/helpers/map_locations_helper.rb
+++ b/app/helpers/map_locations_helper.rb
@@ -34,11 +34,11 @@ module MapLocationsHelper
   end
 
   def map_location_remove_marker(map_location, text)
-    content_tag :div, class: "text-right" do
+    content_tag :div, class: "margin-bottom" do
       content_tag :a,
                   id: map_location_remove_marker_link_id(map_location),
                   href: "#",
-                  class: "location-map-remove-marker-button delete" do
+                  class: "js-location-map-remove-marker location-map-remove-marker" do
         text
       end
     end
diff --git a/app/views/admin/budget_investments/_investments.html.erb b/app/views/admin/budget_investments/_investments.html.erb
index 55ccf7f30..a60e2ac11 100644
--- a/app/views/admin/budget_investments/_investments.html.erb
+++ b/app/views/admin/budget_investments/_investments.html.erb
@@ -4,7 +4,7 @@
 
 <% if @investments.any? %>
   <h3 class="inline-block"><%= page_entries_info @investments %></h3>
-  <table>
+  <table class="table-for-mobile">
     <thead>
       <tr>
         <th><%= t("admin.budget_investments.index.table_id") %></th>
diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml
index 39d0e022a..c0b16dedb 100644
--- a/config/locales/en/activerecord.yml
+++ b/config/locales/en/activerecord.yml
@@ -118,7 +118,7 @@ en:
         heading_id: "Heading"
         title: "Title"
         location: "Location"
-        organization_name: "If you are proposing in the name of a collective/organization, write its name"
+        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"
         image_title: "Image title"
       budget/investment/milestone:
diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml
index a0fd28cac..fce3a3ff9 100644
--- a/config/locales/en/budgets.yml
+++ b/config/locales/en/budgets.yml
@@ -104,7 +104,7 @@ en:
         unfeasibility_explanation: Unfeasibility explanation
         code_html: 'Investment project code: <strong>%{code}</strong>'
         location_html: 'Location: <strong>%{location}</strong>'
-        organization_name_html: 'Organization: <strong>%{name}</strong>'
+        organization_name_html: 'Proposed on behalf of: <strong>%{name}</strong>'
         share: Share
         title: Investment project
         supports: Supports
diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml
index 18296b7bf..522ecefa9 100644
--- a/config/locales/es/activerecord.yml
+++ b/config/locales/es/activerecord.yml
@@ -113,7 +113,7 @@ es:
         external_url: "Enlace a documentación adicional"
         location: "Ubicación"
         administrator_id: "Administrador"
-        organization_name: "Si estás proponiendo en nombre de una organización o colectivo, escribe su nombre"
+        organization_name: "Si estás proponiendo en nombre de una organización o colectivo, o en nombre de más gente, escribe su nombre"
         image: "Imagen descriptiva de la propuesta de inversión"
         image_title: "Título de la imagen"
       budget/heading:
diff --git a/config/locales/es/budgets.yml b/config/locales/es/budgets.yml
index 258f394d6..c00b5b714 100644
--- a/config/locales/es/budgets.yml
+++ b/config/locales/es/budgets.yml
@@ -59,7 +59,7 @@ es:
         tags_placeholder: "Escribe las etiquetas que desees separadas por una coma (',')"
         map_location: "Ubicación en el mapa"
         map_location_instructions: "Navega por el mapa hasta la ubicación y coloca el marcador."
-        map_remove_marker: "Eliminar el marcador"
+        map_remove_marker: "Eliminar marcador en el mapa"
         location: "Información adicional de la ubicación"
       index:
         title: Presupuestos participativos
@@ -104,7 +104,7 @@ es:
         unfeasibility_explanation: Informe de inviabilidad
         code_html: 'Código propuesta de gasto: <strong>%{code}</strong>'
         location_html: 'Ubicación: <strong>%{location}</strong>'
-        organization_name_html: 'Organización: <strong>%{name}</strong>'
+        organization_name_html: 'Propuesto en nombre de: <strong>%{name}</strong>'
         share: Compartir
         title: Proyecto de inversión
         supports: Apoyos
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index c54875369..722b70fc3 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -338,7 +338,7 @@ es:
       tags_placeholder: "Escribe las etiquetas que desees separadas por una coma (',')"
       map_location: "Ubicación en el mapa"
       map_location_instructions: "Navega por el mapa hasta la ubicación y coloca el marcador."
-      map_remove_marker: "Eliminar el marcador"
+      map_remove_marker: "Eliminar marcador en el mapa"
       map_skip_checkbox: "Esta propuesta no tiene una ubicación concreta o no la conozco."
     index:
       featured_proposals: Destacadas