diff --git a/src/categories/components/CategoryCreatePage/CategoryCreatePage.tsx b/src/categories/components/CategoryCreatePage/CategoryCreatePage.tsx
index 06e7d1119..3d6aef91a 100644
--- a/src/categories/components/CategoryCreatePage/CategoryCreatePage.tsx
+++ b/src/categories/components/CategoryCreatePage/CategoryCreatePage.tsx
@@ -36,7 +36,7 @@ export const CategoryCreatePage: React.FC<CategoryCreatePageProps> = ({
   return (
     <CategoryCreateForm onSubmit={onSubmit} disabled={disabled}>
       {({ data, change, handlers, submit, isSaveDisabled }) => (
-        <DetailedContent>
+        <DetailedContent useSingleColumn>
           <TopNav
             href={backUrl}
             title={intl.formatMessage({
diff --git a/src/categories/components/CategoryUpdatePage/CategoryUpdatePage.tsx b/src/categories/components/CategoryUpdatePage/CategoryUpdatePage.tsx
index 07a1f486b..714b6c16d 100644
--- a/src/categories/components/CategoryUpdatePage/CategoryUpdatePage.tsx
+++ b/src/categories/components/CategoryUpdatePage/CategoryUpdatePage.tsx
@@ -91,7 +91,7 @@ export const CategoryUpdatePage: React.FC<CategoryUpdatePageProps> = ({
       disabled={disabled}
     >
       {({ data, change, handlers, submit, isSaveDisabled }) => (
-        <DetailedContent>
+        <DetailedContent useSingleColumn>
           <TopNav href={backHref} title={category?.name} />
           <Content>
             <CategoryDetailsForm
diff --git a/src/components/AppLayout/AppLayout.tsx b/src/components/AppLayout/AppLayout.tsx
index 9f124c724..230d44cff 100644
--- a/src/components/AppLayout/AppLayout.tsx
+++ b/src/components/AppLayout/AppLayout.tsx
@@ -60,8 +60,7 @@ const AppLayout: React.FC<AppLayoutProps> = ({ children }) => {
             borderColor="neutralPlain"
             __maxWidth={contentMaxWidth}
             margin="auto"
-            // @ts-ignore
-            __zIndex="3"
+            zIndex="3"
           />
         </Box>
       </Box>
diff --git a/src/components/AppLayout/Content.tsx b/src/components/AppLayout/Content.tsx
index 2eb74bb81..1b3dcd59b 100644
--- a/src/components/AppLayout/Content.tsx
+++ b/src/components/AppLayout/Content.tsx
@@ -1,21 +1,32 @@
 import { Box } from "@saleor/macaw-ui/next";
 import React from "react";
 
-import { borderHeight, savebarHeight, topBarHeight } from "./consts";
+import { useContentHeight } from "./useContentHeight";
 
 interface ContentProps {
   [key: `data-${string}`]: string;
   children: React.ReactNode;
+  noSavebar?: boolean;
+  noTopNav?: boolean;
 }
 
-export const Content: React.FC<ContentProps> = ({ children, ...rest }) => (
-  <Box
-    __gridArea="content"
-    __height={`calc(100vh - ${topBarHeight} - ${savebarHeight} - ${borderHeight})`}
-    overflowY="auto"
-    className="hide-scrollbar"
-    {...rest}
-  >
-    {children}
-  </Box>
-);
+export const Content: React.FC<ContentProps> = ({
+  children,
+  noSavebar = false,
+  noTopNav = false,
+  ...rest
+}) => {
+  const { withoutSaveBar, withSaveBar } = useContentHeight();
+
+  return (
+    <Box
+      __gridArea="content"
+      __height={noSavebar ? withoutSaveBar() : withSaveBar({ noTopNav })}
+      overflowY="auto"
+      className="hide-scrollbar"
+      {...rest}
+    >
+      {children}
+    </Box>
+  );
+};
diff --git a/src/components/AppLayout/RightSidebar.tsx b/src/components/AppLayout/RightSidebar.tsx
index 7a185b22a..ad7dbe30d 100644
--- a/src/components/AppLayout/RightSidebar.tsx
+++ b/src/components/AppLayout/RightSidebar.tsx
@@ -7,17 +7,21 @@ import { borderHeight, savebarHeight } from "./consts";
 interface RightSidebarProps {
   children: React.ReactNode;
   className?: string;
+  noSavebar?: boolean;
 }
 
 export const RightSidebar: React.FC<RightSidebarProps> = ({
   children,
+  noSavebar = false,
   className,
 }) => (
   <Box
     borderStyle="solid"
     borderColor="neutralPlain"
     borderLeftWidth={1}
-    __height={`calc(100vh - ${savebarHeight} - ${borderHeight})`}
+    __height={
+      noSavebar ? "100%" : `calc(100vh - ${savebarHeight} - ${borderHeight})`
+    }
     position="sticky"
     top={0}
     overflowY="auto"
diff --git a/src/components/AppLayout/useContentHeight.test.ts b/src/components/AppLayout/useContentHeight.test.ts
new file mode 100644
index 000000000..5fe86b5ed
--- /dev/null
+++ b/src/components/AppLayout/useContentHeight.test.ts
@@ -0,0 +1,24 @@
+import { useContentHeight } from "./useContentHeight";
+
+describe("useContentHeight", () => {
+  it("should return the correct height without savebar", () => {
+    const { withoutSaveBar } = useContentHeight();
+    const height = withoutSaveBar();
+
+    expect(height).toEqual("calc(100vh - 77px - 1px)");
+  });
+
+  it("should return the correct height with savebar", () => {
+    const { withSaveBar } = useContentHeight();
+    const height = withSaveBar({ noTopNav: false });
+
+    expect(height).toEqual("calc(100vh - 77px - 64px - 1px)");
+  });
+
+  it("should return the correct height with savebar and no top nav", () => {
+    const { withSaveBar } = useContentHeight();
+    const height = withSaveBar({ noTopNav: true });
+
+    expect(height).toEqual("calc(100vh - 0px - 64px - 1px)");
+  });
+});
diff --git a/src/components/AppLayout/useContentHeight.ts b/src/components/AppLayout/useContentHeight.ts
new file mode 100644
index 000000000..76fb4cc46
--- /dev/null
+++ b/src/components/AppLayout/useContentHeight.ts
@@ -0,0 +1,14 @@
+import { borderHeight, savebarHeight, topBarHeight } from "./consts";
+
+export const useContentHeight = () => {
+  const withoutSaveBar = () =>
+    `calc(100vh - ${topBarHeight} - ${borderHeight})`;
+
+  const withSaveBar = ({ noTopNav }) => {
+    const topHeight = noTopNav ? "0px" : topBarHeight;
+
+    return `calc(100vh - ${topHeight} - ${savebarHeight} - ${borderHeight})`;
+  };
+
+  return { withoutSaveBar, withSaveBar };
+};
diff --git a/src/configuration/ConfigurationPage.tsx b/src/configuration/ConfigurationPage.tsx
index 1fca848e9..c6ffa6ce0 100644
--- a/src/configuration/ConfigurationPage.tsx
+++ b/src/configuration/ConfigurationPage.tsx
@@ -99,7 +99,7 @@ export const ConfigurationPage: React.FC<ConfigurationPageProps> = props => {
       <TopNav title={intl.formatMessage(sectionNames.configuration)}>
         {isSmUp && renderVersionInfo}
       </TopNav>
-      <Content>
+      <Content noSavebar>
         <Box paddingX={9} __maxWidth={"1024px"} margin="auto">
           {menus
             .filter(menu =>
diff --git a/src/custom-apps/components/CustomAppListPage/CustomAppListPage.tsx b/src/custom-apps/components/CustomAppListPage/CustomAppListPage.tsx
index 75f238726..30112141a 100644
--- a/src/custom-apps/components/CustomAppListPage/CustomAppListPage.tsx
+++ b/src/custom-apps/components/CustomAppListPage/CustomAppListPage.tsx
@@ -1,4 +1,7 @@
-import { Content } from "@dashboard/components/AppLayout/Content";
+import {
+  borderHeight,
+  topBarHeight,
+} from "@dashboard/components/AppLayout/consts";
 import { TopNav } from "@dashboard/components/AppLayout/TopNav";
 import { Button } from "@dashboard/components/Button";
 import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper";
@@ -46,72 +49,73 @@ const CustomAppListPage: React.FC<CustomAppListPageProps> = ({
           />
         </Button>
       </TopNav>
-      <Content>
-        <Box padding={9}>
-          <Box marginBottom={4}>
-            <Text as="p">
-              <FormattedMessage
-                defaultMessage="Local apps are custom webhooks & token pairs that can be used to
+      <Box
+        padding={9}
+        __height={`calc(100vh - ${topBarHeight} - ${borderHeight})`}
+      >
+        <Box marginBottom={4}>
+          <Text as="p">
+            <FormattedMessage
+              defaultMessage="Local apps are custom webhooks & token pairs that can be used to
             connect apps and access Saleor API."
-                id="L/sNGY"
-              />
-            </Text>
-          </Box>
+              id="L/sNGY"
+            />
+          </Text>
+        </Box>
 
-          <ResponsiveTable>
-            <TableBody>
-              {renderCollection(
-                appsList,
-                (app, index) =>
-                  app ? (
-                    <TableRowLink
-                      key={app.id}
-                      className={classes.tableRow}
-                      href={getCustomAppHref(app.id)}
-                    >
-                      <TableCell className={classes.colName}>
-                        <span data-tc="name" className={classes.appName}>
-                          {app.name}
-                        </span>
-                        {!app.isActive && (
-                          <div className={classes.statusWrapper}>
-                            <DeactivatedText />
-                          </div>
-                        )}
-                      </TableCell>
-                      <TableCell className={classes.colAction}>
-                        <TableButtonWrapper>
-                          <IconButton
-                            variant="secondary"
-                            color="primary"
-                            onClick={() => onRemove(app.id)}
-                          >
-                            <DeleteIcon />
-                          </IconButton>
-                        </TableButtonWrapper>
-                      </TableCell>
-                    </TableRowLink>
-                  ) : (
-                    <AppsSkeleton key={index} />
-                  ),
-                () => (
-                  <TableRowLink className={classes.tableRow}>
+        <ResponsiveTable>
+          <TableBody>
+            {renderCollection(
+              appsList,
+              (app, index) =>
+                app ? (
+                  <TableRowLink
+                    key={app.id}
+                    className={classes.tableRow}
+                    href={getCustomAppHref(app.id)}
+                  >
                     <TableCell className={classes.colName}>
-                      <Typography className={classes.text} variant="body2">
-                        <FormattedMessage
-                          id="voRaz3"
-                          defaultMessage="Your custom-created apps will be shown here."
-                          description="custom apps content"
-                        />
-                      </Typography>
+                      <span data-tc="name" className={classes.appName}>
+                        {app.name}
+                      </span>
+                      {!app.isActive && (
+                        <div className={classes.statusWrapper}>
+                          <DeactivatedText />
+                        </div>
+                      )}
+                    </TableCell>
+                    <TableCell className={classes.colAction}>
+                      <TableButtonWrapper>
+                        <IconButton
+                          variant="secondary"
+                          color="primary"
+                          onClick={() => onRemove(app.id)}
+                        >
+                          <DeleteIcon />
+                        </IconButton>
+                      </TableButtonWrapper>
                     </TableCell>
                   </TableRowLink>
+                ) : (
+                  <AppsSkeleton key={index} />
                 ),
-              )}
-            </TableBody>
-          </ResponsiveTable>
-        </Box>
-      </Content>
+              () => (
+                <TableRowLink className={classes.tableRow}>
+                  <TableCell className={classes.colName}>
+                    <Typography className={classes.text} variant="body2">
+                      <FormattedMessage
+                        id="voRaz3"
+                        defaultMessage="Your custom-created apps will be shown here."
+                        description="custom apps content"
+                      />
+                    </Typography>
+                  </TableCell>
+                </TableRowLink>
+              ),
+            )}
+          </TableBody>
+        </ResponsiveTable>
+      </Box>
     </>
   );
 };
diff --git a/src/customers/components/CustomerCreatePage/CustomerCreatePage.tsx b/src/customers/components/CustomerCreatePage/CustomerCreatePage.tsx
index 91b48437c..5c2d0dd6e 100644
--- a/src/customers/components/CustomerCreatePage/CustomerCreatePage.tsx
+++ b/src/customers/components/CustomerCreatePage/CustomerCreatePage.tsx
@@ -1,9 +1,9 @@
 import { createCountryHandler } from "@dashboard/components/AddressEdit/createCountryHandler";
 import { Content } from "@dashboard/components/AppLayout/Content";
+import { DetailedContent } from "@dashboard/components/AppLayout/DetailedContent";
 import { TopNav } from "@dashboard/components/AppLayout/TopNav";
 import { CardSpacer } from "@dashboard/components/CardSpacer";
 import Form from "@dashboard/components/Form";
-import Grid from "@dashboard/components/Grid";
 import Savebar from "@dashboard/components/Savebar";
 import { customerListUrl } from "@dashboard/customers/urls";
 import {
@@ -152,7 +152,7 @@ const CustomerCreatePage: React.FC<CustomerCreatePageProps> = ({
         const handleCountrySelect = createCountryHandler(countrySelect, set);
 
         return (
-          <>
+          <DetailedContent useSingleColumn>
             <TopNav
               href={customerListUrl()}
               title={intl.formatMessage({
@@ -162,33 +162,31 @@ const CustomerCreatePage: React.FC<CustomerCreatePageProps> = ({
               })}
             />
             <Content>
-              <Grid>
-                <div>
-                  <CustomerCreateDetails
-                    data={data}
-                    disabled={disabled}
-                    errors={errors}
-                    onChange={change}
-                  />
-                  <CardSpacer />
-                  <CustomerCreateAddress
-                    countries={countryChoices}
-                    countryDisplayName={countryDisplayName}
-                    data={data}
-                    disabled={disabled}
-                    errors={errors}
-                    onChange={change}
-                    onCountryChange={handleCountrySelect}
-                  />
-                  <CardSpacer />
-                  <CustomerCreateNote
-                    data={data}
-                    disabled={disabled}
-                    errors={errors}
-                    onChange={change}
-                  />
-                </div>
-              </Grid>
+              <div>
+                <CustomerCreateDetails
+                  data={data}
+                  disabled={disabled}
+                  errors={errors}
+                  onChange={change}
+                />
+                <CardSpacer />
+                <CustomerCreateAddress
+                  countries={countryChoices}
+                  countryDisplayName={countryDisplayName}
+                  data={data}
+                  disabled={disabled}
+                  errors={errors}
+                  onChange={change}
+                  onCountryChange={handleCountrySelect}
+                />
+                <CardSpacer />
+                <CustomerCreateNote
+                  data={data}
+                  disabled={disabled}
+                  errors={errors}
+                  onChange={change}
+                />
+              </div>
               <Savebar
                 disabled={isSaveDisabled}
                 state={saveButtonBar}
@@ -196,7 +194,7 @@ const CustomerCreatePage: React.FC<CustomerCreatePageProps> = ({
                 onCancel={() => navigate(customerListUrl())}
               />
             </Content>
-          </>
+          </DetailedContent>
         );
       }}
     </Form>
diff --git a/src/home/components/HomePage/HomePage.tsx b/src/home/components/HomePage/HomePage.tsx
index c29091c98..8d0ffa56b 100644
--- a/src/home/components/HomePage/HomePage.tsx
+++ b/src/home/components/HomePage/HomePage.tsx
@@ -80,7 +80,7 @@ const HomePage: React.FC<HomePageProps> = props => {
   return (
     <DetailedContent>
       <TopNav title={<HomeHeader userName={userName} />} />
-      <Content>
+      <Content noSavebar>
         <Box paddingLeft={9} paddingRight={11}>
           <CardSpacer />
           <RequirePermissions
@@ -155,7 +155,7 @@ const HomePage: React.FC<HomePageProps> = props => {
         </Box>
       </Content>
       {activities && (
-        <RightSidebar>
+        <RightSidebar noSavebar>
           <RequirePermissions
             requiredPermissions={[PermissionEnum.MANAGE_ORDERS]}
           >
diff --git a/src/navigation/components/MenuDetailsPage/MenuDetailsPage.tsx b/src/navigation/components/MenuDetailsPage/MenuDetailsPage.tsx
index e1a9185d1..49d99e0c8 100644
--- a/src/navigation/components/MenuDetailsPage/MenuDetailsPage.tsx
+++ b/src/navigation/components/MenuDetailsPage/MenuDetailsPage.tsx
@@ -86,8 +86,8 @@ const MenuDetailsPage: React.FC<MenuDetailsPageProps> = ({
   return (
     <Form confirmLeave initial={initialForm} onSubmit={handleSubmit}>
       {({ change, data, submit }) => (
-        <DetailedContent>
-          <Content>
+        <DetailedContent useSingleColumn>
+          <Content noTopNav>
             <Box padding={9} margin="auto" height="100vh">
               <Backlink href={menuListUrl()}>
                 {intl.formatMessage(sectionNames.navigation)}
diff --git a/src/navigation/components/MenuListPage/MenuListPage.tsx b/src/navigation/components/MenuListPage/MenuListPage.tsx
index 4468e5649..eaa0344a0 100644
--- a/src/navigation/components/MenuListPage/MenuListPage.tsx
+++ b/src/navigation/components/MenuListPage/MenuListPage.tsx
@@ -1,3 +1,7 @@
+import {
+  borderHeight,
+  topBarHeight,
+} from "@dashboard/components/AppLayout/consts";
 import { TopNav } from "@dashboard/components/AppLayout/TopNav";
 import { Button } from "@dashboard/components/Button";
 import { configurationMenuUrl } from "@dashboard/configuration";
@@ -5,6 +9,7 @@ import { MenuFragment } from "@dashboard/graphql";
 import { sectionNames } from "@dashboard/intl";
 import { menuListUrl, MenuListUrlSortField } from "@dashboard/navigation/urls";
 import { ListActions, PageListProps, SortPage } from "@dashboard/types";
+import { Box } from "@saleor/macaw-ui/next";
 import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 
@@ -38,7 +43,9 @@ const MenuListPage: React.FC<MenuListPageProps> = ({ ...listProps }) => {
           />
         </Button>
       </TopNav>
-      <MenuList {...listProps} />
+      <Box __height={`calc(100vh - ${topBarHeight} - ${borderHeight})`}>
+        <MenuList {...listProps} />
+      </Box>
     </>
   );
 };
diff --git a/src/pageTypes/components/PageTypeAttributes/PageTypeAttributes.tsx b/src/pageTypes/components/PageTypeAttributes/PageTypeAttributes.tsx
index dd85b6f59..48e3f2de8 100644
--- a/src/pageTypes/components/PageTypeAttributes/PageTypeAttributes.tsx
+++ b/src/pageTypes/components/PageTypeAttributes/PageTypeAttributes.tsx
@@ -14,7 +14,7 @@ import TableRowLink from "@dashboard/components/TableRowLink";
 import { AttributeFragment, AttributeTypeEnum } from "@dashboard/graphql";
 import { renderCollection } from "@dashboard/misc";
 import { ListActions, ReorderAction } from "@dashboard/types";
-import { Card, TableCell } from "@material-ui/core";
+import { Card, CardContent, TableCell } from "@material-ui/core";
 import { DeleteIcon, IconButton, makeStyles } from "@saleor/macaw-ui";
 import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
@@ -95,93 +95,95 @@ const PageTypeAttributes: React.FC<PageTypeAttributesProps> = props => {
           </Button>
         }
       />
-      <ResponsiveTable>
-        <colgroup>
-          <col className={classes.colGrab} />
-          <col />
-          <col className={classes.colName} />
-          <col className={classes.colSlug} />
-          <col className={classes.colAction} />
-        </colgroup>
-        {attributes?.length > 0 && (
-          <TableHead
-            colSpan={numberOfColumns}
-            disabled={disabled}
-            dragRows
-            selected={selected}
-            items={attributes}
-            toggleAll={toggleAll}
-            toolbar={toolbar}
-          >
-            <TableCell className={classes.colName}>
-              <FormattedMessage id="kTr2o8" defaultMessage="Attribute name" />
-            </TableCell>
-            <TableCell className={classes.colName}>
-              <FormattedMessage
-                id="nf3XSt"
-                defaultMessage="Slug"
-                description="attribute internal name"
-              />
-            </TableCell>
-            <TableCell />
-          </TableHead>
-        )}
-        <SortableTableBody onSortEnd={onAttributeReorder}>
-          {renderCollection(
-            attributes,
-            (attribute, attributeIndex) => {
-              const isSelected = attribute ? isChecked(attribute.id) : false;
+      <CardContent>
+        <ResponsiveTable>
+          <colgroup>
+            <col className={classes.colGrab} />
+            <col />
+            <col className={classes.colName} />
+            <col className={classes.colSlug} />
+            <col className={classes.colAction} />
+          </colgroup>
+          {attributes?.length > 0 && (
+            <TableHead
+              colSpan={numberOfColumns}
+              disabled={disabled}
+              dragRows
+              selected={selected}
+              items={attributes}
+              toggleAll={toggleAll}
+              toolbar={toolbar}
+            >
+              <TableCell className={classes.colName}>
+                <FormattedMessage id="kTr2o8" defaultMessage="Attribute name" />
+              </TableCell>
+              <TableCell className={classes.colName}>
+                <FormattedMessage
+                  id="nf3XSt"
+                  defaultMessage="Slug"
+                  description="attribute internal name"
+                />
+              </TableCell>
+              <TableCell />
+            </TableHead>
+          )}
+          <SortableTableBody onSortEnd={onAttributeReorder}>
+            {renderCollection(
+              attributes,
+              (attribute, attributeIndex) => {
+                const isSelected = attribute ? isChecked(attribute.id) : false;
 
-              return (
-                <SortableTableRow
-                  selected={isSelected}
-                  className={!!attribute ? classes.link : undefined}
-                  hover={!!attribute}
-                  href={attribute ? attributeUrl(attribute.id) : undefined}
-                  key={attribute?.id}
-                  index={attributeIndex || 0}
-                  data-test-id={"id-" + attribute?.id}
-                >
-                  <TableCell padding="checkbox">
-                    <Checkbox
-                      checked={isSelected}
-                      disabled={disabled}
-                      disableClickPropagation
-                      onChange={() => toggle(attribute.id)}
+                return (
+                  <SortableTableRow
+                    selected={isSelected}
+                    className={!!attribute ? classes.link : undefined}
+                    hover={!!attribute}
+                    href={attribute ? attributeUrl(attribute.id) : undefined}
+                    key={attribute?.id}
+                    index={attributeIndex || 0}
+                    data-test-id={"id-" + attribute?.id}
+                  >
+                    <TableCell padding="checkbox">
+                      <Checkbox
+                        checked={isSelected}
+                        disabled={disabled}
+                        disableClickPropagation
+                        onChange={() => toggle(attribute.id)}
+                      />
+                    </TableCell>
+                    <TableCell className={classes.colName} data-test-id="name">
+                      {attribute?.name || <Skeleton />}
+                    </TableCell>
+                    <TableCell className={classes.colSlug} data-test-id="slug">
+                      {attribute?.slug || <Skeleton />}
+                    </TableCell>
+                    <TableCell className={classes.colAction}>
+                      <TableButtonWrapper>
+                        <IconButton
+                          variant="secondary"
+                          onClick={() => onAttributeUnassign(attribute.id)}
+                        >
+                          <DeleteIcon color="primary" />
+                        </IconButton>
+                      </TableButtonWrapper>
+                    </TableCell>
+                  </SortableTableRow>
+                );
+              },
+              () => (
+                <TableRowLink>
+                  <TableCell colSpan={numberOfColumns}>
+                    <FormattedMessage
+                      id="ztQgD8"
+                      defaultMessage="No attributes found"
                     />
                   </TableCell>
-                  <TableCell className={classes.colName} data-test-id="name">
-                    {attribute?.name || <Skeleton />}
-                  </TableCell>
-                  <TableCell className={classes.colSlug} data-test-id="slug">
-                    {attribute?.slug || <Skeleton />}
-                  </TableCell>
-                  <TableCell className={classes.colAction}>
-                    <TableButtonWrapper>
-                      <IconButton
-                        variant="secondary"
-                        onClick={() => onAttributeUnassign(attribute.id)}
-                      >
-                        <DeleteIcon color="primary" />
-                      </IconButton>
-                    </TableButtonWrapper>
-                  </TableCell>
-                </SortableTableRow>
-              );
-            },
-            () => (
-              <TableRowLink>
-                <TableCell colSpan={numberOfColumns}>
-                  <FormattedMessage
-                    id="ztQgD8"
-                    defaultMessage="No attributes found"
-                  />
-                </TableCell>
-              </TableRowLink>
-            ),
-          )}
-        </SortableTableBody>
-      </ResponsiveTable>
+                </TableRowLink>
+              ),
+            )}
+          </SortableTableBody>
+        </ResponsiveTable>
+      </CardContent>
     </Card>
   );
 };
diff --git a/src/pageTypes/components/PageTypeDetailsPage/PageTypeDetailsPage.tsx b/src/pageTypes/components/PageTypeDetailsPage/PageTypeDetailsPage.tsx
index aa7f1c60e..50906bf8b 100644
--- a/src/pageTypes/components/PageTypeDetailsPage/PageTypeDetailsPage.tsx
+++ b/src/pageTypes/components/PageTypeDetailsPage/PageTypeDetailsPage.tsx
@@ -118,7 +118,7 @@ const PageTypeDetailsPage: React.FC<PageTypeDetailsPageProps> = props => {
         const changeMetadata = makeMetadataChangeHandler(change);
 
         return (
-          <DetailedContent>
+          <DetailedContent useSingleColumn>
             <TopNav href={pageTypeListUrl()} title={pageTitle} />
             <Content>
               <Grid
diff --git a/src/shipping/components/ShippingZonesListPage/ShippingZonesListPage.tsx b/src/shipping/components/ShippingZonesListPage/ShippingZonesListPage.tsx
index d66195295..1e7e80c8a 100644
--- a/src/shipping/components/ShippingZonesListPage/ShippingZonesListPage.tsx
+++ b/src/shipping/components/ShippingZonesListPage/ShippingZonesListPage.tsx
@@ -49,10 +49,10 @@ const ShippingZonesListPage: React.FC<ShippingZonesListPageProps> = ({
           description: "header",
         })}
       />
-      <Content>
+      <Content noSavebar>
         <ShippingZonesList disabled={disabled} {...listProps} />
       </Content>
-      <RightSidebar>
+      <RightSidebar noSavebar>
         <RequirePermissions
           requiredPermissions={[PermissionEnum.MANAGE_SETTINGS]}
         >
diff --git a/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx b/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx
index 7bb837c92..ee2f8958d 100644
--- a/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx
+++ b/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx
@@ -139,7 +139,7 @@ const SiteSettingsPage: React.FC<SiteSettingsPageProps> = props => {
         const handleCountrySelect = createCountryHandler(countrySelect, set);
 
         return (
-          <DetailedContent>
+          <DetailedContent useSingleColumn>
             <TopNav
               href={configurationMenuUrl}
               title={intl.formatMessage(commonMessages.generalInformations)}