diff --git a/portal-ui/src/screens/Console/Common/TableWrapper/TableWrapper.tsx b/portal-ui/src/screens/Console/Common/TableWrapper/TableWrapper.tsx
index 70abf7fda..6909242f7 100644
--- a/portal-ui/src/screens/Console/Common/TableWrapper/TableWrapper.tsx
+++ b/portal-ui/src/screens/Console/Common/TableWrapper/TableWrapper.tsx
@@ -571,6 +571,7 @@ const TableWrapper = ({
     <Grid item xs={12} className={parentClassName}>
       <TooltipWrapper tooltip={tooltip ? tooltip : ""}>
         <Paper
+          style={{ overflow: "hidden" }}
           className={`${classes.paper} ${
             noBackground ? classes.noBackground : ""
           }
@@ -635,7 +636,7 @@ const TableWrapper = ({
                         disableHeader={false}
                         headerClassName={"headerItem"}
                         headerHeight={40}
-                        height={height}
+                        height={height + 8}
                         noRowsRenderer={() => (
                           <Fragment>
                             {customEmptyMessage !== ""
diff --git a/portal-ui/src/screens/Console/License/License.tsx b/portal-ui/src/screens/Console/License/License.tsx
index 727245f77..a2dd19dd7 100644
--- a/portal-ui/src/screens/Console/License/License.tsx
+++ b/portal-ui/src/screens/Console/License/License.tsx
@@ -16,21 +16,17 @@
 
 import React, { Fragment, useCallback, useEffect, useState } from "react";
 import { useSelector } from "react-redux";
-import { Theme } from "@mui/material/styles";
-import createStyles from "@mui/styles/createStyles";
-import { Box, LinearProgress } from "@mui/material";
+import { LinearProgress } from "@mui/material";
 import Grid from "@mui/material/Grid";
 import { SubnetInfo } from "./types";
-import { containerForHeader } from "../Common/FormComponents/common/styleLibrary";
 import PageHeader from "../Common/PageHeader/PageHeader";
 import api from "../../../common/api";
-import { ArrowRightLink, ThemedLogo } from "mds";
+import { ArrowIcon, Button } from "mds";
 import { IAM_PAGES } from "../../../common/SecureComponent/permissions";
 import LicensePlans from "./LicensePlans";
-import { Link } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import PageLayout from "../Common/Layout/PageLayout";
 import RegistrationStatusBanner from "../Support/RegistrationStatusBanner";
-import makeStyles from "@mui/styles/makeStyles";
 import { selOpMode } from "../../../systemSlice";
 import withSuspense from "../Common/Components/withSuspense";
 import { getLicenseConsent } from "./utils";
@@ -39,78 +35,8 @@ const LicenseConsentModal = withSuspense(
   React.lazy(() => import("./LicenseConsentModal"))
 );
 
-const useStyles = makeStyles((theme: Theme) =>
-  createStyles({
-    pageTitle: {
-      backgroundColor: "rgb(250,250,252)",
-      marginTop: 40,
-      border: "1px solid #E5E5E5",
-      paddingTop: 33,
-      paddingLeft: 28,
-      paddingBottom: 30,
-      paddingRight: 28,
-      fontSize: 16,
-      fontWeight: "bold",
-      "& ul": {
-        marginLeft: "-8px",
-        listStyleType: "square",
-        color: "#1C5A8D",
-        fontSize: "16px",
-        "& li": {
-          float: "left",
-          fontSize: 14,
-          marginRight: 40,
-        },
-        "& li::before": {
-          color: "red",
-          content: "•",
-        },
-      },
-    },
-    licDet: {
-      fontSize: 11,
-      color: "#5E5E5E",
-    },
-    linkMore: {
-      marginTop: 10,
-      marginBottom: 20,
-    },
-    link: {
-      textDecoration: "underline !important",
-      color: theme.palette.info.main,
-    },
-    linkButton: {
-      fontFamily: '"Inter", sans-serif',
-      fontWeight: "normal",
-      textTransform: "none",
-      fontSize: "inherit",
-      height: 0,
-      padding: 0,
-      margin: 0,
-    },
-
-    openSourcePolicy: {
-      fontSize: 14,
-      color: "#1C5A8D",
-      fontWeight: "bold",
-    },
-    ...containerForHeader(theme.spacing(4)),
-    icon: {
-      color: theme.palette.primary.main,
-      fontSize: 16,
-      fontWeight: "bold",
-      marginBottom: 20,
-      "& .min-icon": {
-        width: 44,
-        height: 44,
-        marginRight: 15,
-      },
-    },
-  })
-);
-
 const License = () => {
-  const classes = useStyles();
+  const navigate = useNavigate();
   const operatorMode = useSelector(selOpMode);
   const [activateProductModal, setActivateProductModal] =
     useState<boolean>(false);
@@ -193,7 +119,29 @@ const License = () => {
 
   return (
     <Fragment>
-      <PageHeader label="License" />
+      <PageHeader
+        label="MinIO License and Support plans"
+        actions={
+          <Fragment>
+            {!isRegistered && (
+              <Button
+                id={"login-with-subnet"}
+                onClick={() => navigate(IAM_PAGES.REGISTER_SUPPORT)}
+                style={{
+                  fontSize: "14px",
+                  display: "flex",
+                  alignItems: "center",
+                  textDecoration: "none",
+                }}
+                icon={<ArrowIcon />}
+                variant={"callAction"}
+              >
+                Register your cluster
+              </Button>
+            )}
+          </Fragment>
+        }
+      />
 
       <PageLayout>
         <Grid item xs={12}>
@@ -201,74 +149,6 @@ const License = () => {
             <RegistrationStatusBanner email={licenseInfo?.email} />
           )}
         </Grid>
-        {!isRegistered && (
-          <Grid
-            item
-            xs={12}
-            sx={{
-              display: "flex",
-              flexFlow: "column",
-            }}
-          >
-            <Box
-              sx={{
-                padding: "25px",
-                border: "1px solid #eaeaea",
-                display: "flex",
-                alignItems: "center",
-                justifyContent: "flex-end",
-              }}
-            >
-              <Box
-                sx={{
-                  marginRight: "8px",
-                  fontSize: "16px",
-                  fontWeight: 600,
-                  display: "flex",
-                  alignItems: "center",
-
-                  "& svg": {
-                    width: "83px",
-                    height: "14px",
-                    marginLeft: "8px",
-                    marginRight: "5px",
-                  },
-                }}
-              >
-                Are you already a customer of <ThemedLogo />?
-              </Box>
-              <Link
-                to={IAM_PAGES.REGISTER_SUPPORT}
-                className={classes.link}
-                style={{
-                  fontSize: "14px",
-                  display: "flex",
-                  alignItems: "center",
-                }}
-              >
-                Register this cluster{" "}
-                <ArrowRightLink
-                  style={{
-                    width: "13px",
-                    height: "8px",
-                    marginLeft: "5px",
-                    marginTop: "3px",
-                  }}
-                />
-              </Link>
-            </Box>
-
-            <Box
-              sx={{
-                padding: "40px 0px 40px 0px",
-                fontSize: "16px",
-                fontWeight: 600,
-              }}
-            >
-              MinIO License and Support plans
-            </Box>
-          </Grid>
-        )}
 
         <LicensePlans
           activateProductModal={activateProductModal}
diff --git a/portal-ui/src/screens/Console/License/LicenseConsentModal.tsx b/portal-ui/src/screens/Console/License/LicenseConsentModal.tsx
index a8484f2a5..43f12a4ba 100644
--- a/portal-ui/src/screens/Console/License/LicenseConsentModal.tsx
+++ b/portal-ui/src/screens/Console/License/LicenseConsentModal.tsx
@@ -49,7 +49,6 @@ const LicenseConsentModal = ({
           flexFlow: "column",
           "& .link-text": {
             color: "#2781B0",
-            fontSize: "16px",
             fontWeight: 600,
           },
         }}
diff --git a/portal-ui/src/screens/Console/License/LicenseFAQ.tsx b/portal-ui/src/screens/Console/License/LicenseFAQ.tsx
index 74b05b924..a48a9cac8 100644
--- a/portal-ui/src/screens/Console/License/LicenseFAQ.tsx
+++ b/portal-ui/src/screens/Console/License/LicenseFAQ.tsx
@@ -15,8 +15,17 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Fragment } from "react";
+import makeStyles from "@mui/styles/makeStyles";
+
+const useStyles = makeStyles((theme) => ({
+  linkText: {
+    color: "#2781B0",
+    fontWeight: 600,
+  },
+}));
 
 const LicenseFAQ = () => {
+  const classes = useStyles();
   return (
     <Fragment>
       <h2>What is the GNU AGPL v3?</h2>
@@ -25,7 +34,11 @@ const LicenseFAQ = () => {
         It is a common open source license certified by the Free Software
         Foundation and the Open Source Initiative. You can get a copy of the GNU
         AGPL v3 license with MinIO source code or at&nbsp;
-        <a href={"https://min.io/compliance?ref=con"} target={"_blank"}>
+        <a
+          href={"https://min.io/compliance?ref=con"}
+          target={"_blank"}
+          className={classes.linkText}
+        >
           https://www.gnu.org/licenses/agpl-3.0.en.html
         </a>
         .
diff --git a/portal-ui/src/screens/Console/License/LicensePlans.tsx b/portal-ui/src/screens/Console/License/LicensePlans.tsx
index 48891cb35..a46d67f00 100644
--- a/portal-ui/src/screens/Console/License/LicensePlans.tsx
+++ b/portal-ui/src/screens/Console/License/LicensePlans.tsx
@@ -595,6 +595,7 @@ const LicensePlans = ({ licenseInfo, operatorMode }: IRegisterStatus) => {
                 if (isHeader) {
                   return getCommunityPlanHeader();
                 }
+
                 if (featureTitleRow) {
                   return (
                     <FeatureTitleRowCmp
@@ -638,6 +639,7 @@ const LicensePlans = ({ licenseInfo, operatorMode }: IRegisterStatus) => {
               if (isHeader) {
                 return getStandardPlanHeader();
               }
+
               if (featureTitleRow) {
                 return (
                   <FeatureTitleRowCmp