diff --git a/app/assets/stylesheets/content/_grid_mobile.sass b/app/assets/stylesheets/content/_grid_mobile.sass
new file mode 100644
index 0000000000..296627a89d
--- /dev/null
+++ b/app/assets/stylesheets/content/_grid_mobile.sass
@@ -0,0 +1,11 @@
+@include breakpoint(680px down)
+  .grid--container
+    grid-template-columns: auto !important
+    grid-template-rows: auto !important
+    grid-gap: 15px
+    padding: 15px 2px
+
+  .grid--area
+    &.-widgeted
+      grid-column: 1/2 !important
+      grid-row: unset !important
diff --git a/app/assets/stylesheets/content/_index.sass b/app/assets/stylesheets/content/_index.sass
index 09791e2345..5c856debf1 100644
--- a/app/assets/stylesheets/content/_index.sass
+++ b/app/assets/stylesheets/content/_index.sass
@@ -71,6 +71,7 @@
 @import content/contextual
 @import content/tooltip
 @import content/grid
+@import content/grid_mobile
 @import content/resizer
 @import content/version
 @import content/project_status
diff --git a/app/assets/stylesheets/content/menus/_menu_blocks.sass b/app/assets/stylesheets/content/menus/_menu_blocks.sass
index 09df8733d1..6ce3e44308 100644
--- a/app/assets/stylesheets/content/menus/_menu_blocks.sass
+++ b/app/assets/stylesheets/content/menus/_menu_blocks.sass
@@ -22,3 +22,8 @@
     align-self: end
     &:before
       padding-left: 10px
+
+@include breakpoint(680px down)
+  .menu-blocks--container
+    grid-template: unset
+    grid-gap: 15px
diff --git a/app/assets/stylesheets/layout/_base.sass b/app/assets/stylesheets/layout/_base.sass
index 64f9b96db0..a21af0dd1f 100644
--- a/app/assets/stylesheets/layout/_base.sass
+++ b/app/assets/stylesheets/layout/_base.sass
@@ -59,7 +59,6 @@
 
   &.nosidebar
     margin-left: 0
-    padding: 20px 40px
 
   &.nomenus
     margin:     0
diff --git a/frontend/src/app/modules/grids/grid/grid.component.html b/frontend/src/app/modules/grids/grid/grid.component.html
index 936ca92561..2ecbd7c190 100644
--- a/frontend/src/app/modules/grids/grid/grid.component.html
+++ b/frontend/src/app/modules/grids/grid/grid.component.html
@@ -24,7 +24,7 @@
       <span *ngIf="drag.isDraggable"
             class="grid--area-drag-handle
                    icon
-                   icon-drag-handle"
+                   icon-drag-handle hidden-for-mobile"
             cdkDragHandle></span>
 
       <ndc-dynamic [ndcDynamicComponent]="widgetComponent(area)"
@@ -47,7 +47,7 @@
 
   <!-- One grid area per cell (row x columns) -->
   <div *ngFor="let area of layout.gridAreas; trackBy: identifyGridArea;"
-       class="grid--area"
+       class="grid--area hidden-for-mobile"
        [ngClass] = "{'-drop-target': drag.currentlyDragging,
                      '-drop-only': drag.isDropOnlyArea(area),
                      '-resize-target': resize.isTarget(area),
@@ -62,15 +62,14 @@
        (mouseover)="layout.setMousedOverArea(area)"
        [cdkDropListData]="area"
        [cdkDropListConnectedTo]="layout.gridAreaIds">
-    <div class="grid--widget-add hidden-for-mobile"
-         *ngIf="layout.schema"
+    <div class="grid--widget-add"
          [title]="add.addText"
          (click)="add.widget(area)">
     </div>
   </div>
 
   <div *ngFor="let gap of layout.gridGaps; trackBy: identifyGridArea;"
-       class="grid--area -gap"
+       class="grid--area -gap hidden-for-mobile"
        [ngClass] = "{'-addable': add.isAddable(gap),
                      '-help-mode': layout.inHelpMode,
                      '-row': gap.isRow,
@@ -81,8 +80,7 @@
        [style.grid-column-end]="gap.gridEndColumn"
        [id]="gap.guid"
        (mouseover)="layout.setMousedOverArea(gap)">
-    <div class="grid--widget-add -gap hidden-for-mobile"
-         *ngIf="layout.schema"
+    <div class="grid--widget-add -gap"
          [title]="add.addText"
          (click)="add.widget(gap)">
     </div>
diff --git a/frontend/src/app/modules/grids/grid/page/grid-page.component.sass b/frontend/src/app/modules/grids/grid/page/grid-page.component.sass
index 23b66d7217..8b3bb9ccbf 100644
--- a/frontend/src/app/modules/grids/grid/page/grid-page.component.sass
+++ b/frontend/src/app/modules/grids/grid/page/grid-page.component.sass
@@ -9,3 +9,8 @@
 
 .toolbar-items
   padding-right: 20px
+
+@media only screen and (max-width: 679px)
+  .title-container
+    margin-left: 0
+    margin-bottom: 0