diff --git a/package-lock.json b/package-lock.json
index 725af17..8f4084f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@bluecat/limani",
-    "version": "1.1.6-dev",
+    "version": "1.1.7-dev",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@bluecat/limani",
-            "version": "1.1.6-dev",
+            "version": "1.1.7-dev",
             "license": "MIT",
             "dependencies": {
                 "@fortawesome/free-regular-svg-icons": "^6.2.0",
diff --git a/package.json b/package.json
index c47cc8e..b534802 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@bluecat/limani",
-    "version": "1.1.6-dev",
+    "version": "1.1.7-dev",
     "description": "Gateway shared components",
     "usage": "dev",
     "scripts": {
diff --git a/src/components/FormButtons.less b/src/components/FormButtons.less
index e693510..475e7f5 100644
--- a/src/components/FormButtons.less
+++ b/src/components/FormButtons.less
@@ -24,6 +24,7 @@
     flex-direction: row;
     gap: 1rem;
     justify-content: flex-end;
-    margin-top: @sp-24;
-    padding-right: @sp-32;
+    position: fixed;
+    bottom: @sp-24;
+    right: @sp-40;
 }
diff --git a/src/components/FormLayout.less b/src/components/FormLayout.less
index e401f8a..3bec3ed 100644
--- a/src/components/FormLayout.less
+++ b/src/components/FormLayout.less
@@ -21,7 +21,6 @@
 
 .FormLayout {
     flex-direction: column;
-    flex: 1;
     overflow: hidden;
     padding: @sp-12 0 0 0;
 }
diff --git a/src/pageLayout/PageContent.js b/src/pageLayout/PageContent.js
index 476ea86..009fefe 100644
--- a/src/pageLayout/PageContent.js
+++ b/src/pageLayout/PageContent.js
@@ -50,13 +50,11 @@ const PageContent = ({ className, pageTitle, appTitle, children }) => {
 
     return (
         <div className={classNames.join(' ')}>
-            {pageTitle ? (
-                <>
-                    {buildBreadcrumb(pageTitle)}
-                    <h1 id='pageTitle'>{pageTitle}</h1>
-                </>
-            ) : null}
-            {children}
+            {pageTitle ? <>{buildBreadcrumb(pageTitle)}</> : null}
+            <div className={classNames.join(' ') + '--scrolling'}>
+                <h1 id='pageTitle'>{pageTitle}</h1>
+                {children}
+            </div>
         </div>
     );
 };
diff --git a/src/pageLayout/PageContent.less b/src/pageLayout/PageContent.less
index a8d981a..0ed47c9 100644
--- a/src/pageLayout/PageContent.less
+++ b/src/pageLayout/PageContent.less
@@ -25,9 +25,16 @@
     flex: 1;
     overflow: hidden;
 
-    padding: @sp-24 @sp-04 @sp-24 @sp-40;
+    padding: @sp-24 @sp-04 @sp-80 @sp-40;
 }
 
 .PageContent--noPadding {
     padding: 0;
 }
+
+.PageContent--scrolling {
+    flex: 1;
+    flex-basis: 0;
+    overflow-x: hidden;
+    overflow-y: auto;
+}