diff --git a/geonode_mapstore_client/client/js/utils/AppUtils.js b/geonode_mapstore_client/client/js/utils/AppUtils.js
index 44cef74ba2..f23caaf72e 100644
--- a/geonode_mapstore_client/client/js/utils/AppUtils.js
+++ b/geonode_mapstore_client/client/js/utils/AppUtils.js
@@ -151,15 +151,6 @@ function setupLocale(locale) {
         .then((localeDataMod) => {
             const localeData = localeDataMod.default;
             addLocaleData([...localeData]);
-            if (!global.Intl) {
-                return import('intl')
-                    .then((intlMod) => {
-                        global.Intl = intlMod.default;
-                        return import(`intl/locale-data/jsonp/${locale}.js`).then(() => {
-                            return locale;
-                        });
-                    });
-            }
             // setup locale for moment
             moment.locale(locale);
             return locale;
diff --git a/geonode_mapstore_client/client/themes/geonode/less/_base.less b/geonode_mapstore_client/client/themes/geonode/less/_base.less
index 78df328612..c8f51680ee 100644
--- a/geonode_mapstore_client/client/themes/geonode/less/_base.less
+++ b/geonode_mapstore_client/client/themes/geonode/less/_base.less
@@ -261,4 +261,10 @@ div.chart-color-class-modal {
             white-space: nowrap;
         }
     }
+}
+
+.page-viewer {
+    footer {
+        z-index: 10;
+    }
 }
\ No newline at end of file
diff --git a/geonode_mapstore_client/client/themes/geonode/less/ms-theme.less b/geonode_mapstore_client/client/themes/geonode/less/ms-theme.less
index c655586a7f..bd01498913 100644
--- a/geonode_mapstore_client/client/themes/geonode/less/ms-theme.less
+++ b/geonode_mapstore_client/client/themes/geonode/less/ms-theme.less
@@ -417,4 +417,12 @@ div#mapstore-globalspinner {
     .divider {
         margin: 0.25rem 0;
     }
+}
+
+#navigationBar .mapToolbar {
+    margin-bottom: 6px;
+}
+
+#mapstore-map-footer #mapstore-mouseposition {
+    height: auto;
 }
\ No newline at end of file
diff --git a/geonode_mapstore_client/static/mapstore/configs/localConfig.json b/geonode_mapstore_client/static/mapstore/configs/localConfig.json
index dc54de1500..6f3b62e029 100644
--- a/geonode_mapstore_client/static/mapstore/configs/localConfig.json
+++ b/geonode_mapstore_client/static/mapstore/configs/localConfig.json
@@ -31,7 +31,7 @@
                 "md": 420
             },
             "bottom": {
-                "sm": 30
+                "sm": 0
             }
         }
     },
@@ -180,7 +180,10 @@
                 }
             },
             {
-                "name": "MapFooter"
+                "name": "MapFooter",
+                "cfg": {
+                    "containerPosition": "footer"
+                }
             },
             {
                 "name": "Notifications"
@@ -246,7 +249,10 @@
                 }
             },
             {
-                "name": "MapFooter"
+                "name": "MapFooter",
+                "cfg": {
+                    "containerPosition": "footer"
+                }
             },
             {
                 "name": "Timeline"
@@ -326,7 +332,10 @@
                 "name": "Expander"
             },
             {
-                "name": "MapFooter"
+                "name": "MapFooter",
+                "cfg": {
+                    "containerPosition": "footer"
+                }
             },
             {
                 "name": "Notifications"
@@ -409,7 +418,10 @@
                 "name": "Expander"
             },
             {
-                "name": "MapFooter"
+                "name": "MapFooter",
+                "cfg": {
+                    "containerPosition": "footer"
+                }
             },
             {
                 "name": "TOC",
@@ -753,7 +765,10 @@
                 "name": "Expander"
             },
             {
-                "name": "MapFooter"
+                "name": "MapFooter",
+                "cfg": {
+                    "containerPosition": "footer"
+                }
             },
             {
                 "name": "Measure"
@@ -1349,7 +1364,10 @@
                 "name": "ScaleBox"
             },
             {
-                "name": "MapFooter"
+                "name": "MapFooter",
+                "cfg": {
+                    "containerPosition": "footer"
+                }
             },
             {
                 "name": "Notifications"
@@ -1409,7 +1427,10 @@
                 }
             },
             {
-                "name": "MapFooter"
+                "name": "MapFooter",
+                "cfg": {
+                    "containerPosition": "footer"
+                }
             },
             {
                 "name": "Map",
@@ -1649,7 +1670,10 @@
                 "name": "Expander"
             },
             {
-                "name": "MapFooter"
+                "name": "MapFooter",
+                "cfg": {
+                    "containerPosition": "footer"
+                }
             },
             {
                 "name": "Measure"
@@ -2918,7 +2942,10 @@
                 "name": "Expander"
             },
             {
-                "name": "MapFooter"
+                "name": "MapFooter",
+                "cfg": {
+                    "containerPosition": "footer"
+                }
             },
             {
                 "name": "TOC",
@@ -3047,7 +3074,10 @@
                 "name": "Expander"
             },
             {
-                "name": "MapFooter"
+                "name": "MapFooter",
+                "cfg": {
+                    "containerPosition": "footer"
+                }
             },
             {
                 "name": "Legend"
diff --git a/geonode_mapstore_client/static/mapstore/configs/pluginsConfig.json b/geonode_mapstore_client/static/mapstore/configs/pluginsConfig.json
index d80f33e6df..91b3ef4ef5 100644
--- a/geonode_mapstore_client/static/mapstore/configs/pluginsConfig.json
+++ b/geonode_mapstore_client/static/mapstore/configs/pluginsConfig.json
@@ -109,7 +109,10 @@
     {
       "name": "MapFooter",
       "mandatory": true,
-      "hidden": true
+      "hidden": true,
+      "defaultConfig": {
+        "containerPosition": "footer"
+      }
     },
     {
       "name": "Widgets",