diff --git a/CHANGELOG.md b/CHANGELOG.md
index 601dd0d3d..5d79a256a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,14 @@
 ## 8.15.14 (Unreleased)
 
+This release changes the Desktop grid width from 20 to 24, enabling evenly-spaced 3 or 4 columns. You will need to resize/rearrange Dashboard Widgets after this update to correct for the new width.
+
 ### Features
 
  - Add Step Line Series Type to Graph (Synchronous) Widget
 
 ### Miscellaneous
 
+ - Change Dashboard grid width from 20 to 24
  - Add endpoint option to RAM Input for when using non-standard IP/port
 
 
diff --git a/mycodo/mycodo_flask/static/css/gridstack-custom.css b/mycodo/mycodo_flask/static/css/gridstack-custom.css
index 175186cdc..a005d42cc 100644
--- a/mycodo/mycodo_flask/static/css/gridstack-custom.css
+++ b/mycodo/mycodo_flask/static/css/gridstack-custom.css
@@ -1,243 +1,279 @@
 .grid-stack > .grid-stack-item {
-  min-width: 5%;
-}
-.grid-stack > .grid-stack-item[gs-w="1"] {
-  width: 5%;
+  width: 4.167%;
 }
 .grid-stack > .grid-stack-item[gs-x="1"] {
-  left: 5%;
+  left: 4.167%;
 }
-.grid-stack > .grid-stack-item[gs-min-w="1"] {
-  min-width: 5%;
+.grid-stack > .grid-stack-item[gs-w="2"] {
+  width: 8.333%;
 }
-.grid-stack > .grid-stack-item[gs-max-w="1"] {
-  max-width: 5%;
+.grid-stack > .grid-stack-item[gs-min-w="1"] {
+  left: 4.167%;
 }
-.grid-stack > .grid-stack-item[gs-w="2"] {
-  width: 10%;
+.grid-stack > .grid-stack-item[gs-max-w="2"] {
+  width: 8.333%;
 }
 .grid-stack > .grid-stack-item[gs-x="2"] {
-  left: 10%;
+  left: 8.333%;
 }
-.grid-stack > .grid-stack-item[gs-min-w="2"] {
-  min-width: 10%;
+.grid-stack > .grid-stack-item[gs-w="3"] {
+  width: 12.5%;
 }
-.grid-stack > .grid-stack-item[gs-max-w="2"] {
-  max-width: 10%;
+.grid-stack > .grid-stack-item[gs-min-w="2"] {
+  left: 8.333%;
 }
-.grid-stack > .grid-stack-item[gs-w="3"] {
-  width: 15%;
+.grid-stack > .grid-stack-item[gs-max-w="3"] {
+  width: 12.5%;
 }
 .grid-stack > .grid-stack-item[gs-x="3"] {
-  left: 15%;
+  left: 12.5%;
 }
-.grid-stack > .grid-stack-item[gs-min-w="3"] {
-  min-width: 15%;
+.grid-stack > .grid-stack-item[gs-w="4"] {
+  width: 16.667%;
 }
-.grid-stack > .grid-stack-item[gs-max-w="3"] {
-  max-width: 15%;
+.grid-stack > .grid-stack-item[gs-min-w="3"] {
+  left: 12.5%;
 }
-.grid-stack > .grid-stack-item[gs-w="4"] {
-  width: 20%;
+.grid-stack > .grid-stack-item[gs-max-w="4"] {
+  width: 16.667%;
 }
 .grid-stack > .grid-stack-item[gs-x="4"] {
-  left: 20%;
+  left: 16.667%;
 }
-.grid-stack > .grid-stack-item[gs-min-w="4"] {
-  min-width: 20%;
+.grid-stack > .grid-stack-item[gs-w="5"] {
+  width: 20.833%;
 }
-.grid-stack > .grid-stack-item[gs-max-w="4"] {
-  max-width: 20%;
+.grid-stack > .grid-stack-item[gs-min-w="4"] {
+  left: 16.667%;
 }
-.grid-stack > .grid-stack-item[gs-w="5"] {
-  width: 25%;
+.grid-stack > .grid-stack-item[gs-max-w="5"] {
+  width: 20.833%;
 }
 .grid-stack > .grid-stack-item[gs-x="5"] {
-  left: 25%;
+  left: 20.833%;
 }
-.grid-stack > .grid-stack-item[gs-min-w="5"] {
-  min-width: 25%;
+.grid-stack > .grid-stack-item[gs-w="6"] {
+  width: 25%;
 }
-.grid-stack > .grid-stack-item[gs-max-w="5"] {
-  max-width: 25%;
+.grid-stack > .grid-stack-item[gs-min-w="5"] {
+  left: 20.833%;
 }
-.grid-stack > .grid-stack-item[gs-w="6"] {
-  width: 30%;
+.grid-stack > .grid-stack-item[gs-max-w="6"] {
+  width: 25%;
 }
 .grid-stack > .grid-stack-item[gs-x="6"] {
-  left: 30%;
+  left: 25%;
 }
-.grid-stack > .grid-stack-item[gs-min-w="6"] {
-  min-width: 30%;
+.grid-stack > .grid-stack-item[gs-w="7"] {
+  width: 29.167%;
 }
-.grid-stack > .grid-stack-item[gs-max-w="6"] {
-  max-width: 30%;
+.grid-stack > .grid-stack-item[gs-min-w="6"] {
+  left: 25%;
 }
-.grid-stack > .grid-stack-item[gs-w="7"] {
-  width: 35%;
+.grid-stack > .grid-stack-item[gs-max-w="7"] {
+  width: 29.167%;
 }
 .grid-stack > .grid-stack-item[gs-x="7"] {
-  left: 35%;
+  left: 29.167%;
 }
-.grid-stack > .grid-stack-item[gs-min-w="7"] {
-  min-width: 35%;
+.grid-stack > .grid-stack-item[gs-w="8"] {
+  width: 33.333%;
 }
-.grid-stack > .grid-stack-item[gs-max-w="7"] {
-  max-width: 35%;
+.grid-stack > .grid-stack-item[gs-min-w="7"] {
+  left: 29.167%;
 }
-.grid-stack > .grid-stack-item[gs-w="8"] {
-  width: 40%;
+.grid-stack > .grid-stack-item[gs-max-w="8"] {
+  width: 33.333%;
 }
 .grid-stack > .grid-stack-item[gs-x="8"] {
-  left: 40%;
+  left: 33.333%;
 }
-.grid-stack > .grid-stack-item[gs-min-w="8"] {
-  min-width: 40%;
+.grid-stack > .grid-stack-item[gs-w="9"] {
+  width: 37.5%;
 }
-.grid-stack > .grid-stack-item[gs-max-w="8"] {
-  max-width: 40%;
+.grid-stack > .grid-stack-item[gs-min-w="8"] {
+  left: 33.333%;
 }
-.grid-stack > .grid-stack-item[gs-w="9"] {
-  width: 45%;
+.grid-stack > .grid-stack-item[gs-max-w="9"] {
+  width: 37.5%;
 }
 .grid-stack > .grid-stack-item[gs-x="9"] {
-  left: 45%;
+  left: 37.5%;
 }
-.grid-stack > .grid-stack-item[gs-min-w="9"] {
-  min-width: 45%;
+.grid-stack > .grid-stack-item[gs-w="10"] {
+  width: 41.667%;
 }
-.grid-stack > .grid-stack-item[gs-max-w="9"] {
-  max-width: 45%;
+.grid-stack > .grid-stack-item[gs-min-w="9"] {
+  left: 37.5%;
 }
-.grid-stack > .grid-stack-item[gs-w="10"] {
-  width: 50%;
+.grid-stack > .grid-stack-item[gs-max-w="10"] {
+  width: 41.667%;
 }
 .grid-stack > .grid-stack-item[gs-x="10"] {
-  left: 50%;
+  left: 41.667%;
 }
-.grid-stack > .grid-stack-item[gs-min-w="10"] {
-  min-width: 50%;
+.grid-stack > .grid-stack-item[gs-w="11"] {
+  width: 45.833%;
 }
-.grid-stack > .grid-stack-item[gs-max-w="10"] {
-  max-width: 50%;
+.grid-stack > .grid-stack-item[gs-min-w="10"] {
+  left: 41.667%;
 }
-.grid-stack > .grid-stack-item[gs-w="11"] {
-  width: 55%;
+.grid-stack > .grid-stack-item[gs-max-w="11"] {
+  width: 45.833%;
 }
 .grid-stack > .grid-stack-item[gs-x="11"] {
-  left: 55%;
+  left: 45.833%;
 }
-.grid-stack > .grid-stack-item[gs-min-w="11"] {
-  min-width: 55%;
+.grid-stack > .grid-stack-item[gs-w="12"] {
+  width: 50%;
 }
-.grid-stack > .grid-stack-item[gs-max-w="11"] {
-  max-width: 55%;
+.grid-stack > .grid-stack-item[gs-min-w="11"] {
+  left: 45.833%;
 }
-.grid-stack > .grid-stack-item[gs-w="12"] {
-  width: 60%;
+.grid-stack > .grid-stack-item[gs-max-w="12"] {
+  width: 50%;
 }
 .grid-stack > .grid-stack-item[gs-x="12"] {
-  left: 60%;
+  left: 50%;
 }
-.grid-stack > .grid-stack-item[gs-min-w="12"] {
-  min-width: 60%;
+.grid-stack > .grid-stack-item[gs-w="13"] {
+  width: 54.167%;
 }
-.grid-stack > .grid-stack-item[gs-max-w="12"] {
-  max-width: 60%;
+.grid-stack > .grid-stack-item[gs-min-w="12"] {
+  left: 50%;
 }
-.grid-stack > .grid-stack-item[gs-w="13"] {
-  width: 65%;
+.grid-stack > .grid-stack-item[gs-max-w="13"] {
+  width: 54.167%;
 }
 .grid-stack > .grid-stack-item[gs-x="13"] {
-  left: 65%;
+  left: 54.167%;
 }
-.grid-stack > .grid-stack-item[gs-min-w="13"] {
-  min-width: 65%;
+.grid-stack > .grid-stack-item[gs-w="14"] {
+  width: 58.333%;
 }
-.grid-stack > .grid-stack-item[gs-max-w="13"] {
-  max-width: 65%;
+.grid-stack > .grid-stack-item[gs-min-w="13"] {
+  left: 54.167%;
 }
-.grid-stack > .grid-stack-item[gs-w="14"] {
-  width: 70%;
+.grid-stack > .grid-stack-item[gs-max-w="14"] {
+  width: 58.333%;
 }
 .grid-stack > .grid-stack-item[gs-x="14"] {
-  left: 70%;
+  left: 58.333%;
 }
-.grid-stack > .grid-stack-item[gs-min-w="14"] {
-  min-width: 70%;
+.grid-stack > .grid-stack-item[gs-w="15"] {
+  width: 62.5%;
 }
-.grid-stack > .grid-stack-item[gs-max-w="14"] {
-  max-width: 70%;
+.grid-stack > .grid-stack-item[gs-min-w="14"] {
+  left: 58.333%;
 }
-.grid-stack > .grid-stack-item[gs-w="15"] {
-  width: 75%;
+.grid-stack > .grid-stack-item[gs-max-w="15"] {
+  width: 62.5%;
 }
 .grid-stack > .grid-stack-item[gs-x="15"] {
-  left: 75%;
+  left: 62.5%;
 }
-.grid-stack > .grid-stack-item[gs-min-w="15"] {
-  min-width: 75%;
+.grid-stack > .grid-stack-item[gs-w="16"] {
+  width: 66.667%;
 }
-.grid-stack > .grid-stack-item[gs-max-w="15"] {
-  max-width: 75%;
+.grid-stack > .grid-stack-item[gs-min-w="15"] {
+  left: 62.5%;
 }
-.grid-stack > .grid-stack-item[gs-w="16"] {
-  width: 80%;
+.grid-stack > .grid-stack-item[gs-max-w="16"] {
+  width: 66.667%;
 }
 .grid-stack > .grid-stack-item[gs-x="16"] {
-  left: 80%;
+  left: 66.667%;
 }
-.grid-stack > .grid-stack-item[gs-min-w="16"] {
-  min-width: 80%;
+.grid-stack > .grid-stack-item[gs-w="17"] {
+  width: 70.833%;
 }
-.grid-stack > .grid-stack-item[gs-max-w="16"] {
-  max-width: 80%;
+.grid-stack > .grid-stack-item[gs-min-w="16"] {
+  left: 66.667%;
 }
-.grid-stack > .grid-stack-item[gs-w="17"] {
-  width: 85%;
+.grid-stack > .grid-stack-item[gs-max-w="17"] {
+  width: 70.833%;
 }
 .grid-stack > .grid-stack-item[gs-x="17"] {
-  left: 85%;
+  left: 70.833%;
 }
-.grid-stack > .grid-stack-item[gs-min-w="17"] {
-  min-width: 85%;
+.grid-stack > .grid-stack-item[gs-w="18"] {
+  width: 75%;
 }
-.grid-stack > .grid-stack-item[gs-max-w="17"] {
-  max-width: 85%;
+.grid-stack > .grid-stack-item[gs-min-w="17"] {
+  left: 70.833%;
 }
-.grid-stack > .grid-stack-item[gs-w="18"] {
-  width: 90%;
+.grid-stack > .grid-stack-item[gs-max-w="18"] {
+  width: 75%;
 }
 .grid-stack > .grid-stack-item[gs-x="18"] {
-  left: 90%;
+  left: 75%;
 }
-.grid-stack > .grid-stack-item[gs-min-w="18"] {
-  min-width: 90%;
+.grid-stack > .grid-stack-item[gs-w="19"] {
+  width: 79.167%;
 }
-.grid-stack > .grid-stack-item[gs-max-w="18"] {
-  max-width: 90%;
+.grid-stack > .grid-stack-item[gs-min-w="18"] {
+  left: 75%;
 }
-.grid-stack > .grid-stack-item[gs-w="19"] {
-  width: 95%;
+.grid-stack > .grid-stack-item[gs-max-w="19"] {
+  width: 79.167%;
 }
 .grid-stack > .grid-stack-item[gs-x="19"] {
-  left: 95%;
+  left: 79.167%;
 }
-.grid-stack > .grid-stack-item[gs-min-w="19"] {
-  min-width: 95%;
+.grid-stack > .grid-stack-item[gs-w="20"] {
+  width: 83.333%;
 }
-.grid-stack > .grid-stack-item[gs-max-w="19"] {
-  max-width: 95%;
+.grid-stack > .grid-stack-item[gs-min-w="19"] {
+  left: 79.167%;
 }
-.grid-stack > .grid-stack-item[gs-w="20"] {
-  width: 100%;
+.grid-stack > .grid-stack-item[gs-max-w="20"] {
+  width: 83.333%;
 }
 .grid-stack > .grid-stack-item[gs-x="20"] {
-  left: 100%;
+  left: 83.333%;
+}
+.grid-stack > .grid-stack-item[gs-w="21"] {
+  width: 87.5%;
 }
 .grid-stack > .grid-stack-item[gs-min-w="20"] {
-  min-width: 100%;
+  left: 83.333%;
 }
-.grid-stack > .grid-stack-item[gs-max-w="20"] {
-  max-width: 100%;
+.grid-stack > .grid-stack-item[gs-max-w="21"] {
+  width: 87.5%;
+}
+.grid-stack > .grid-stack-item[gs-x="21"] {
+  left: 87.5%;
+}
+.grid-stack > .grid-stack-item[gs-w="22"] {
+  width: 91.667%;
+}
+.grid-stack > .grid-stack-item[gs-min-w="21"] {
+  left: 87.5%;
+}
+.grid-stack > .grid-stack-item[gs-max-w="22"] {
+  width: 91.667%;
+}
+.grid-stack > .grid-stack-item[gs-x="22"] {
+  left: 91.667%;
+}
+.grid-stack > .grid-stack-item[gs-w="23"] {
+  width: 95.833%;
+}
+.grid-stack > .grid-stack-item[gs-min-w="22"] {
+  left: 91.667%;
+}
+.grid-stack > .grid-stack-item[gs-max-w="23"] {
+  width: 95.833%;
+}
+.grid-stack > .grid-stack-item[gs-x="23"] {
+  left: 95.833%;
+}
+.grid-stack > .grid-stack-item[gs-w="24"] {
+  width: 100%;
+}
+.grid-stack > .grid-stack-item[gs-min-w="23"] {
+  left: 95.833%;
+}
+.grid-stack > .grid-stack-item[gs-max-w="24"] {
+  width: 100%;
 }
\ No newline at end of file
diff --git a/mycodo/mycodo_flask/static/scss/gridstack-custom.scss b/mycodo/mycodo_flask/static/scss/gridstack-custom.scss
deleted file mode 100644
index fe2696df3..000000000
--- a/mycodo/mycodo_flask/static/scss/gridstack-custom.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-// use https://www.sassmeister.com if unable to compile locally
-.grid-stack > .grid-stack-item {
-
-    $gridstack-columns: 20;
-
-    @for $i from 1 through $gridstack-columns {
-        &[data-gs-width='#{$i}'] {
-          width: (100% / $gridstack-columns) * $i;
-          min-width: (100% / $gridstack-columns) * $i;
-        }
-        &[data-gs-x='#{$i}'] { left: (100% / $gridstack-columns) * $i; }
-        &.grid-stack-item[data-gs-min-width='#{$i}'] { min-width: (100% / $gridstack-columns) * $i; }
-        &.grid-stack-item[data-gs-max-width='#{$i}'] { max-width: (100% / $gridstack-columns) * $i; }
-    }
-}
diff --git a/mycodo/mycodo_flask/templates/pages/dashboard.html b/mycodo/mycodo_flask/templates/pages/dashboard.html
index 466cdd9f2..e9c3c09d2 100644
--- a/mycodo/mycodo_flask/templates/pages/dashboard.html
+++ b/mycodo/mycodo_flask/templates/pages/dashboard.html
@@ -129,7 +129,7 @@ <h5>{{_('Custom Options')}}</h5>
   // Dashboard Grid
   let options = {
     cellHeight: {{misc.grid_cell_height}},
-    column: 20,
+    column: 24,
     resizable: {
       handles: 'se, sw'
     },
diff --git a/mycodo/mycodo_flask/templates/pages/function.html b/mycodo/mycodo_flask/templates/pages/function.html
index de3dff683..7adc8acfe 100644
--- a/mycodo/mycodo_flask/templates/pages/function.html
+++ b/mycodo/mycodo_flask/templates/pages/function.html
@@ -77,7 +77,7 @@ <h4>{{dict_translation['function']['title']}} <a href="{{help_page[0]}}" target=
         gs-id="{{each_function.unique_id}}"
         gs-x="0"
         gs-y="{{each_function.position_y}}"
-        gs-w="20"
+        gs-w="24"
         gs-h="1"
         gs-no-resize="true">
         {% include 'pages/function_options/conditional_entry.html' %}
@@ -90,7 +90,7 @@ <h4>{{dict_translation['function']['title']}} <a href="{{help_page[0]}}" target=
         gs-id="{{each_function.unique_id}}"
         gs-x="0"
         gs-y="{{each_function.position_y}}"
-        gs-w="20"
+        gs-w="24"
         gs-h="1"
         gs-no-resize="true">
         {% include 'pages/function_options/pid_entry.html' %}
@@ -103,7 +103,7 @@ <h4>{{dict_translation['function']['title']}} <a href="{{help_page[0]}}" target=
         gs-id="{{each_function.unique_id}}"
         gs-x="0"
         gs-y="{{each_function.position_y}}"
-        gs-w="20"
+        gs-w="24"
         gs-h="1"
         gs-no-resize="true">
         {% include 'pages/function_options/trigger_entry.html' %}
@@ -116,7 +116,7 @@ <h4>{{dict_translation['function']['title']}} <a href="{{help_page[0]}}" target=
         gs-id="{{each_function.unique_id}}"
         gs-x="0"
         gs-y="{{each_function.position_y}}"
-        gs-w="20"
+        gs-w="24"
         gs-h="1"
         gs-no-resize="true">
         {% include 'pages/function_options/function_entry.html' %}
@@ -129,7 +129,7 @@ <h4>{{dict_translation['function']['title']}} <a href="{{help_page[0]}}" target=
         gs-id="{{each_function.unique_id}}"
         gs-x="0"
         gs-y="{{each_function.position_y}}"
-        gs-w="20"
+        gs-w="24"
         gs-h="1"
         gs-no-resize="true">
         {% include 'pages/function_options/custom_function_entry.html' %}
@@ -149,7 +149,7 @@ <h4>{{dict_translation['function']['title']}} <a href="{{help_page[0]}}" target=
     // Grid
     let options = {
       cellHeight: gridstack_item_height + 5,
-      column: 20,
+      column: 24,
       margin: 0,
       draggable: {
         handle: '.panel-heading'
@@ -354,7 +354,7 @@ <h4>{{dict_translation['function']['title']}} <a href="{{help_page[0]}}" target=
                   success: function (new_entry) {
                     if (data.data.messages.success.length !== 0) {
                       grid.addWidget('<div class="grid-stack-item" id="gridstack_function_' + data.data.function_id + '" gs-id="' + data.data.function_id + '">' + new_entry + '</div>', {
-                        w: 20,
+                        w: 24,
                         h: 1,
                         y: 999
                       });
diff --git a/mycodo/mycodo_flask/templates/pages/input.html b/mycodo/mycodo_flask/templates/pages/input.html
index 3ffd7d676..ea882f684 100644
--- a/mycodo/mycodo_flask/templates/pages/input.html
+++ b/mycodo/mycodo_flask/templates/pages/input.html
@@ -65,7 +65,7 @@ <h4>{{dict_translation['input']['title']}} <a href="{{help_page[0]}}" target="_b
         gs-id="{{each_input.unique_id}}"
         gs-x="0"
         gs-y="{{each_input.position_y}}"
-        gs-w="20"
+        gs-w="24"
         gs-h="1"
         gs-no-resize="true">
         {% include 'pages/data_options/input_entry.html' %}
@@ -85,7 +85,7 @@ <h4>{{dict_translation['input']['title']}} <a href="{{help_page[0]}}" target="_b
     // Grid
     let options = {
       cellHeight: gridstack_item_height + 5,
-      column: 20,
+      column: 24,
       margin: 0,
       draggable: {
         handle: '.panel-heading'
@@ -169,7 +169,7 @@ <h4>{{dict_translation['input']['title']}} <a href="{{help_page[0]}}" target="_b
                   success: function (new_entry) {
                     if (data.data.messages.success.length !== 0) {
                       grid.addWidget('<div class="grid-stack-item" id="gridstack_input_' + data.data.input_id + '" gs-id="' + data.data.input_id + '">' + new_entry + '</div>', {
-                        w: 20,
+                        w: 24,
                         h: 1,
                         y: 999
                       });
diff --git a/mycodo/mycodo_flask/templates/pages/output.html b/mycodo/mycodo_flask/templates/pages/output.html
index 3e486542f..8d403c460 100644
--- a/mycodo/mycodo_flask/templates/pages/output.html
+++ b/mycodo/mycodo_flask/templates/pages/output.html
@@ -159,7 +159,7 @@ <h4>{{dict_translation['output']['title']}} <a href="{{help_page[0]}}" target="_
         gs-id="{{each_output.unique_id}}"
         gs-x="0"
         gs-y="{{each_output.position_y}}"
-        gs-w="20"
+        gs-w="24"
         gs-h="{{each_output.size_y}}"
         data-gs-no-resize="true">
         {% include 'pages/output_entry.html' %}
@@ -179,7 +179,7 @@ <h4>{{dict_translation['output']['title']}} <a href="{{help_page[0]}}" target="_
     // Grid
     let options = {
       cellHeight: gridstack_item_height,
-      column: 20,
+      column: 24,
       margin: 0,
       draggable: {
         handle: '.panel-heading'
@@ -256,7 +256,7 @@ <h4>{{dict_translation['output']['title']}} <a href="{{help_page[0]}}" target="_
                   success: function (new_entry) {
                     if (data.data.messages.success.length !== 0) {
                       grid.addWidget('<div class="grid-stack-item" id="gridstack_output_' + data.data.output_id + '" gs-id="' + data.data.output_id + '">' + new_entry + '</div>', {
-                        w: 20,
+                        w: 24,
                         h: data.data.size_y
                       });
                       {% if not hide_tooltips %}$('input[title]').tooltip({placement: 'top'});{% endif %}