2 files changed, 3 insertions, 1 deletions
diff --git a/modern/src/common/components/BottomMenu.js b/modern/src/common/components/BottomMenu.js
index 048cb0d7..30960396 100644
--- a/modern/src/common/components/BottomMenu.js
+++ b/modern/src/common/components/BottomMenu.js
@@ -27,7 +27,7 @@ const BottomMenu = () => {
   const [anchorEl, setAnchorEl] = useState(null);
 
   const currentSelection = () => {
-    if (location.pathname.startsWith('/settings/user')) {
+    if (location.pathname === `/settings/user/${userId}`) {
       return 3;
     } if (location.pathname.startsWith('/settings')) {
       return 2;
diff --git a/modern/src/common/components/PageLayout.js b/modern/src/common/components/PageLayout.js
index e37ae4dc..a1f117c4 100644
--- a/modern/src/common/components/PageLayout.js
+++ b/modern/src/common/components/PageLayout.js
@@ -28,6 +28,8 @@ const useStyles = makeStyles((theme) => ({
     flexGrow: 1,
     alignItems: 'stretch',
     overflow: 'auto',
+    display: 'flex',
+    flexDirection: 'column',
   },
 }));