diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index 2a1a2035a..34fa86d32 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -9,7 +9,6 @@
 // 06. Polls
 // 07. Legislation
 // 08. CMS
-// 09. Map
 // 10. Budgets
 // 11. Newsletters
 //
@@ -230,14 +229,6 @@ $table-header:   #ecf1f6;
   display: none;
 }
 
-.input-group {
-
-  .input-group-button {
-    padding-bottom: rem-calc(16);
-    vertical-align: top;
-  }
-}
-
 .sortable thead th:hover {
   cursor: pointer;
   text-decoration: underline;
@@ -247,10 +238,6 @@ $table-header:   #ecf1f6;
   color: $color-success;
 }
 
-.disabled {
-  color: $text-medium;
-}
-
 .icon-sortable {
   font-family: "Font Awesome 5 Free";
   font-size: $small-font-size;
@@ -309,24 +296,6 @@ code {
 // 03. List elements
 // -----------------
 
-.delete {
-  border-bottom: 1px dotted;
-  color: $delete;
-  font-size: $small-font-size;
-
-  &:hover,
-  &:active,
-  &:focus {
-    border-bottom-color: transparent;
-    color: color.adjust($delete, $lightness: -10%);
-  }
-}
-
-[class^="icon-"].delete {
-  border: 0;
-  font-size: $base-font-size;
-}
-
 .rejected {
   color: $delete;
 }
@@ -344,14 +313,6 @@ code {
   padding: rem-calc(6) rem-calc(12);
 }
 
-.button.small.success {
-  margin-left: rem-calc(12);
-
-  &.no-margin {
-    margin-left: 0;
-  }
-}
-
 .moderation-description {
   max-height: rem-calc(65);
   max-width: rem-calc(700);
@@ -554,35 +515,6 @@ table {
   }
 }
 
-.field {
-  margin-bottom: 1rem;
-
-  @include breakpoint(medium) {
-    margin-bottom: 0;
-  }
-
-  a {
-    color: $delete;
-    line-height: 3rem;
-
-    span {
-      text-decoration: underline;
-    }
-
-    .icon-x {
-      line-height: 0;
-      text-decoration: none;
-      vertical-align: sub;
-    }
-
-    &:active,
-    &:focus,
-    &:hover {
-      text-decoration: none;
-    }
-  }
-}
-
 .fullscreen-container {
 
   a {
@@ -761,54 +693,6 @@ table {
   }
 }
 
-// 09. Map
-// --------------
-
-.map {
-  height: 350px;
-  width: 100%;
-
-  .map-marker {
-    left: 50%;
-    margin-top: -5px;
-    position: absolute;
-    top: 50%;
-    visibility: visible;
-
-    .map-icon {
-      background: #00cae9;
-      border-radius: 50% 50% 50% 0;
-      height: 30px;
-      transform: rotate(-45deg);
-      width: 30px;
-    }
-
-    .map-icon::after {
-      background: #fff;
-      border-radius: 50%;
-      content: "";
-      height: 14px;
-      margin: 8px 0 0 8px;
-      position: absolute;
-      width: 14px;
-    }
-  }
-
-  .map-attributtion {
-    height: auto;
-    visibility: visible;
-  }
-}
-
-.map-marker {
-  visibility: hidden;
-}
-
-.map-attributtion {
-  height: 0;
-  visibility: hidden;
-}
-
 // 10. Budgets
 // -----------------
 
diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 192baa5c2..6f3cd02e1 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -10,6 +10,7 @@
 // 06. Forms
 // 07. Callout
 // 08. User account
+// 09. Map
 // 10. Official levels
 // 11. Tables
 // 12. Social
@@ -487,6 +488,25 @@ button,
   }
 }
 
+.delete {
+  border-bottom: 1px dotted;
+  color: $delete;
+  font-size: $small-font-size;
+
+  &:hover,
+  &:active,
+  &:focus {
+    border-bottom-color: transparent;
+    color: color.adjust($delete, $lightness: -10%);
+  }
+}
+
+[class^="icon-"].delete {
+  border: 0;
+  font-size: $base-font-size;
+}
+
+
 // 02. Header
 // ----------
 
@@ -934,6 +954,55 @@ form {
   }
 }
 
+.input-group {
+
+  .input-group-button {
+    padding-bottom: rem-calc(16);
+    vertical-align: top;
+  }
+}
+
+.disabled {
+  color: $text-medium;
+}
+
+.button.small.success {
+  margin-left: rem-calc(12);
+
+  &.no-margin {
+    margin-left: 0;
+  }
+}
+
+.field {
+  margin-bottom: 1rem;
+
+  @include breakpoint(medium) {
+    margin-bottom: 0;
+  }
+
+  a {
+    color: $delete;
+    line-height: 3rem;
+
+    span {
+      text-decoration: underline;
+    }
+
+    .icon-x {
+      line-height: 0;
+      text-decoration: none;
+      vertical-align: sub;
+    }
+
+    &:active,
+    &:focus,
+    &:hover {
+      text-decoration: none;
+    }
+  }
+}
+
 .translatable-fields {
 
   &.highlight {
@@ -1180,6 +1249,54 @@ form {
   }
 }
 
+// 09. Map
+// -------
+
+.map {
+  height: 350px;
+  width: 100%;
+
+  .map-marker {
+    left: 50%;
+    margin-top: -5px;
+    position: absolute;
+    top: 50%;
+    visibility: visible;
+
+    .map-icon {
+      background: #00cae9;
+      border-radius: 50% 50% 50% 0;
+      height: 30px;
+      transform: rotate(-45deg);
+      width: 30px;
+    }
+
+    .map-icon::after {
+      background: #fff;
+      border-radius: 50%;
+      content: "";
+      height: 14px;
+      margin: 8px 0 0 8px;
+      position: absolute;
+      width: 14px;
+    }
+  }
+
+  .map-attributtion {
+    height: auto;
+    visibility: visible;
+  }
+}
+
+.map-marker {
+  visibility: hidden;
+}
+
+.map-attributtion {
+  height: 0;
+  visibility: hidden;
+}
+
 // 10. Officials levels
 // --------------------