diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
index bc7234c50761..a82c4aa9286c 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
@@ -180,7 +180,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", function () {
 
     // Dynamically generate the CSS style for the grid polyfill to use for the case tile
     // useUniformUnits - true if the grid's cells should have the same height as width
-    const buildCellGridStyle = function (numRows, numColumns, useUniformUnits, prefix) {
+    const buildCellGridStyle = function (numRows, numColumns, useUniformUnits, prefix, isMultiSelect) {
         let heightString;
 
         if (useUniformUnits) {
@@ -195,6 +195,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", function () {
             numColumns: numColumns,
             heightString: heightString,
             prefix: prefix,
+            isMultiSelect: isMultiSelect,
         };
         const templateString = $("#cell-grid-style-template").html();
         const template = _.template(templateString);
@@ -486,7 +487,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", function () {
         const useUniformUnits = options.useUniformUnits;
 
         const caseTileStyles = buildCaseTileStyles(options.tiles, options.styles, numRows, numColumns,
-            numEntitiesPerRow, useUniformUnits, 'list');
+            numEntitiesPerRow, useUniformUnits, 'list', options.isMultiSelect);
 
         const gridPolyfillPath = FormplayerFrontend.getChannel().request('gridPolyfillPath');
 
@@ -1095,10 +1096,10 @@ hqDefine("cloudcare/js/formplayer/menus/views", function () {
     // - shape and size of the tile's layout grid
     // - the tile's visual style and its outer boundary
     // - layout of the case tiles on the outer, visible grid
-    const buildCaseTileStyles = function (tiles, styles, numRows, numColumns, numEntitiesPerRow, useUniformUnits, prefix) {
+    const buildCaseTileStyles = function (tiles, styles, numRows, numColumns, numEntitiesPerRow, useUniformUnits, prefix, isMultiSelect) {
         const caseTileStyles = {};
         caseTileStyles.cellLayoutStyle = buildCellLayout(tiles, styles, prefix);
-        caseTileStyles.cellGridStyle = buildCellGridStyle(numRows, numColumns, useUniformUnits, prefix);
+        caseTileStyles.cellGridStyle = buildCellGridStyle(numRows, numColumns, useUniformUnits, prefix, isMultiSelect);
         if (numEntitiesPerRow > 1) {
             caseTileStyles.cellContainerStyle = buildCellContainerStyle(numEntitiesPerRow);
             caseTileStyles.cellWrapperStyle = $("#cell-wrapper-style-template");
diff --git a/corehq/apps/cloudcare/templates/formplayer/case_list.html b/corehq/apps/cloudcare/templates/formplayer/case_list.html
index 05f2fc844837..40ac1413eb1b 100644
--- a/corehq/apps/cloudcare/templates/formplayer/case_list.html
+++ b/corehq/apps/cloudcare/templates/formplayer/case_list.html
@@ -289,7 +289,13 @@ <h1  aria-label="<%- title %>" tabindex="0" class="page-title"><%- title %></h1>
   background-color: transparent;
   color: #685c53;
   justify-items: left;
-  padding: 20px 20px 10px 20px;
+  <% if (model.prefix === "persistent") { %>
+    margin: 20px 20px 10px 20px;
+  <% } else if (model.isMultiSelect) { %>
+    margin: 10px 30px 0 10px;
+  <% } else { %>
+    margin: 10px 20px 0 20px;
+  <% } %>
   }
 </script>
 
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/content.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/content.less
index b0e142ff2c1b..fe66cc37f634 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/content.less
+++ b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/content.less
@@ -76,8 +76,7 @@ body {
 }
 
 .select-row-checkbox-div {
-  padding-top: 10px;
-  padding-left: 10px;
+  margin: 10px 10px 10px 10px;
   float: left;
 }
 
diff --git a/corehq/toggles/__init__.py b/corehq/toggles/__init__.py
index bf0dcb2475f2..cd7731d1dc0c 100644
--- a/corehq/toggles/__init__.py
+++ b/corehq/toggles/__init__.py
@@ -1031,11 +1031,11 @@ def _ensure_valid_randomness(randomness):
 
 GEOCODER_USER_PROXIMITY = StaticToggle(
     "geocoder_user_proximity",
-    "USH: Adjust geo coder result to be more relevant to user and project.",
+    "USH: Adjust geocoder result to be more relevant to user and project.",
     TAG_CUSTOM,
     namespaces=[NAMESPACE_DOMAIN],
     description="""
-    This has two effects on getting geo coder search results:
+    This has two effects on getting geocoder search results:
     1. Based on the bounding box of the project default location all result falling outside of it
        will be filtered out when used in the case search.
     2. Proximity to the users location will be taken into account for the results order.