diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index a98e8f256..586628556 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -623,19 +623,28 @@ footer {
   }
 }
 
-.tag-cloud {
+.categories {
 
-  h3 {
-    border-top: 2px solid $brand;
+  a {
+    background: $highlight;
+    border-radius: rem-calc(6);
     display: inline-block;
-    font-family: $font-family-sans-serif;
-    font-size: rem-calc(16);
-    margin: -1px 0 rem-calc(12);
-    padding-top: $line-height/4;
-    text-transform: uppercase;
+    font-size: $small-font-size;
+    margin-bottom: $line-height/3;
+    padding: $line-height/4 $line-height/3;
+    text-decoration: none;
   }
 }
 
+h3.sidebar-title {
+  border-top: 2px solid $brand;
+  display: inline-block;
+  font-size: rem-calc(16);
+  margin: -1px 0 rem-calc(12);
+  padding-top: $line-height/4;
+  text-transform: uppercase;
+}
+
 // 05. Auth pages
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
diff --git a/app/views/proposals/_categories.html.erb b/app/views/proposals/_categories.html.erb
index 61ee995df..4d429b055 100644
--- a/app/views/proposals/_categories.html.erb
+++ b/app/views/proposals/_categories.html.erb
@@ -1,9 +1,9 @@
 <div class="sidebar-divider"></div>
-<h3><%= t("shared.tags_cloud.categories") %></h3>
+<h3 class="sidebar-title"><%= t("shared.tags_cloud.categories") %></h3>
 <br>
 
-<ul id="categories" style="list-style-type: none;">
+<div id="categories" class="categories">
   <% @categories.each do |category| %>
-    <li><%= link_to category.name, proposals_path(search: category.name) %></li>
+    <%= link_to category.name, proposals_path(search: category.name) %>
   <% end %>
-</ul>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/views/proposals/_form.html.erb b/app/views/proposals/_form.html.erb
index 9eb8dcce7..af1d219d3 100644
--- a/app/views/proposals/_form.html.erb
+++ b/app/views/proposals/_form.html.erb
@@ -39,7 +39,7 @@
       <%= f.text_field :external_url, placeholder: t("proposals.form.proposal_external_url"), label: false %>
     </div>
 
-    <div class="small-12 column">
+    <div class="small-12 medium-6 column">
       <%= f.label :geozone_id,  t("spending_proposals.form.geozone") %>
       <%= f.select :geozone_id, geozone_select_options, {include_blank: t("geozones.none"), label: false} %>
     </div>
diff --git a/app/views/proposals/_geozones.html.erb b/app/views/proposals/_geozones.html.erb
index cf2eb37db..ccaa21e65 100644
--- a/app/views/proposals/_geozones.html.erb
+++ b/app/views/proposals/_geozones.html.erb
@@ -1,7 +1,6 @@
 <div class="sidebar-divider"></div>
-<h3><%= t("shared.tags_cloud.districts") %></h3>
+<h3 class="sidebar-title"><%= t("shared.tags_cloud.districts") %></h3>
 <br>
-
 <%= link_to map_proposals_path, id: 'map' do %>
   <%= image_tag("map.jpg") %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/proposals/map.html.erb b/app/views/proposals/map.html.erb
index 9609c2eb5..84c7721f2 100644
--- a/app/views/proposals/map.html.erb
+++ b/app/views/proposals/map.html.erb
@@ -1 +1 @@
-<%= render 'shared/map', new_url_path: new_proposal_path %>
\ No newline at end of file
+<%= render 'shared/map', new_url_path: new_proposal_path %>
diff --git a/app/views/shared/_map.html.erb b/app/views/shared/_map.html.erb
index 359266751..f7d409dba 100644
--- a/app/views/shared/_map.html.erb
+++ b/app/views/shared/_map.html.erb
@@ -1,49 +1,52 @@
-<div id="proposals" class="proposals-list small-12 medium-9 column">
+<div class="row">
+  <div class="small-12 medium-9 column margin-top">
 
-  <h3><%= t("map.title") %></h3>
+    <h1><%= t("map.title") %></h1>
 
-  <%= image_tag("map.jpg", usemap: "#map") %>
+    <div class="row">
+      <div class="small-12 medium-3 column">
+        <ul id="geozones" class="no-bullet">
+          <% @geozones.each do |geozone| %>
+            <li><%= link_to geozone.name, proposals_path(search: geozone.name) %></li>
+          <% end %>
+        </ul>
+      </div>
 
-  <map name="map" id="html_map">
-    <% @geozones.each do |geozone| %>
-      <area shape="poly"
-            coords="<%= geozone.html_map_coordinates %>"
-            href="<%= polymorphic_url(@resource, search: geozone.name) %>"
-            title="<%= geozone.name %>"
-            alt="<%= geozone.name %>">
-    <% end %>
-  </map>
-  <br>
+      <div class="show-for-medium-up medium-9 column text-center">
+        <%= image_tag("map.jpg", usemap: "#map") %>
+      </div>
 
-  <div id="geozones">
-    <% @geozones.each do |geozone| %>
-      <div><%= link_to geozone.name, proposals_path(search: geozone.name) %></div>
-    <% end %>
-  </div>
-  </br>
+      <map name="map" id="html_map">
+        <% @geozones.each do |geozone| %>
+          <area shape="poly"
+                coords="<%= geozone.html_map_coordinates %>"
+                href="<%= polymorphic_url(@resource, search: geozone.name) %>"
+                title="<%= geozone.name %>"
+                alt="<%= geozone.name %>">
+        <% end %>
+      </map>
+    </div>
 
-  <h3><%= t("map.proposal_for_district") %></h3>
+    <h2><%= t("map.proposal_for_district") %></h2>
 
-  <div>
     <%= form_for(@resource, url: new_url_path, method: :get ) do |f| %>
-      <div class="small-12 column">
+      <div class="small-12 medium-4">
         <%= f.label :geozone_id,  t("map.select_district") %>
         <%= f.select :geozone_id, geozone_select_options,
                      {include_blank: t("geozones.none"), label: false} %>
       </div>
 
-      <div class="actions small-12 column">
+      <div class="actions small-12">
         <%= f.submit(class: "button radius", value: t("map.start_proposal")) %>
       </div>
     <% end %>
   </div>
 
+  <div class="small-12 medium-3 column">
+    <aside class="sidebar" role="complementary">
+      <%= link_to t("map.start_proposal"),
+                  new_proposal_path, class: 'button radius expand' %>
+      <%= render "shared/tag_cloud", taggable: 'proposal' %>
+    </aside>
+  </div>
 </div>
-
-<div class="small-12 medium-3 column">
-  <aside class="sidebar" role="complementary">
-    <%= link_to t("map.start_proposal"),
-                new_proposal_path, class: 'button radius expand' %>
-    <%= render "shared/tag_cloud", taggable: 'proposal' %>
-  </aside>
-</div>
\ No newline at end of file
diff --git a/app/views/shared/_tag_cloud.html.erb b/app/views/shared/_tag_cloud.html.erb
index 7caf943d0..06bf85c2b 100644
--- a/app/views/shared/_tag_cloud.html.erb
+++ b/app/views/shared/_tag_cloud.html.erb
@@ -1,6 +1,6 @@
 <div id="tag-cloud" class="tag-cloud">
   <div class="sidebar-divider"></div>
-  <h3><%= t("shared.tags_cloud.tags") %></h3>
+  <h3 class="sidebar-title"><%= t("shared.tags_cloud.tags") %></h3>
   <br>
 
   <% tag_cloud @tag_cloud, %w[s m l] do |tag, css_class| %>
diff --git a/config/locales/es.yml b/config/locales/es.yml
index c61df1114..848a14bf9 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -264,7 +264,7 @@ es:
       proposal_title: Título de la propuesta
       proposal_video_url: Enlace a vídeo externo
       proposal_video_url_note: Puedes añadir un enlace a YouTube o Vimeo
-      tags_instructions: "Etiqueta esta propuesta. Puedes elegir entre categorias propuestas o introducir las que desees"
+      tags_instructions: "Etiqueta esta propuesta. Puedes elegir entre las categorías propuestas o introducir las que desees"
       tags_label: Temas
       tag_category_label: "Categorías"
       tags_placeholder: "Escribe las etiquetas que desees separadas por una coma (',')"