diff --git a/src/ui/elements/CopyableBox.tsx b/src/ui/elements/CopyableBox.tsx
index 0771300..0eebd8f 100644
--- a/src/ui/elements/CopyableBox.tsx
+++ b/src/ui/elements/CopyableBox.tsx
@@ -5,6 +5,7 @@ import { addClipboardNotifications } from "../../utils/clipboardNotifs";
 import ClipboardJS from "clipboard";
 import FileSaver from "file-saver";
 import i18next from "i18next";
+import { InlineButtonBox } from "./InlineButtonBox";
 
 export type CopyableBoxProps = {
   title: string;
@@ -34,7 +35,7 @@ export class CopyableBox extends Component<CopyableBoxProps> {
           <h2>{this.props.title}</h2>
         </div>
         <CodeBlock code={this.props.contentString} />
-        <p>
+        <InlineButtonBox>
           <Button
             text={i18next.t("copy_box_download_btn")}
             color="primary"
@@ -49,7 +50,7 @@ export class CopyableBox extends Component<CopyableBoxProps> {
           {this.props.goBack && (
             <Button text={i18next.t("common_back")} color="secondary" onClick={this.props.goBack} />
           )}
-        </p>
+        </InlineButtonBox>
       </div>
     );
   }
diff --git a/src/ui/elements/InlineButtonBox.tsx b/src/ui/elements/InlineButtonBox.tsx
new file mode 100644
index 0000000..b9fd6b7
--- /dev/null
+++ b/src/ui/elements/InlineButtonBox.tsx
@@ -0,0 +1,9 @@
+import { JSX } from "preact";
+
+export type InlineButtonBoxProps = {
+    children?: JSX.Element | JSX.Element[];
+};
+
+export function InlineButtonBox(props: InlineButtonBoxProps): JSX.Element {
+    return <div>{props.children}</div>;
+}
diff --git a/src/ui/pages/Access/Auth/userpass/UserPassUserView.tsx b/src/ui/pages/Access/Auth/userpass/UserPassUserView.tsx
index 1b9c0b5..5fe158a 100644
--- a/src/ui/pages/Access/Auth/userpass/UserPassUserView.tsx
+++ b/src/ui/pages/Access/Auth/userpass/UserPassUserView.tsx
@@ -9,6 +9,7 @@ import { sendErrorNotification } from "../../../../elements/ErrorMessage";
 import { toStr } from "../../../../../utils";
 import { userPassUserDeleteURL, userPassUserEditURL } from "../../../pageLinks";
 import i18next from "i18next";
+import { InlineButtonBox } from "../../../../elements/InlineButtonBox";
 
 export class UserPassUserView extends Component<DefaultPageProps, { user_data: UserType }> {
   async componentDidMount() {
@@ -36,7 +37,7 @@ export class UserPassUserView extends Component<DefaultPageProps, { user_data: U
         <PageTitle title={i18next.t("userpass_user_view_title")} />
 
         <div>
-          <p>
+          <InlineButtonBox>
             <Button
               text={i18next.t("common_delete")}
               color="danger"
@@ -47,7 +48,7 @@ export class UserPassUserView extends Component<DefaultPageProps, { user_data: U
               color="primary"
               route={userPassUserEditURL(baseMount, user)}
             />
-          </p>
+          </InlineButtonBox>
 
           <br />
 
diff --git a/src/ui/pages/Policies/PoliciesHome.tsx b/src/ui/pages/Policies/PoliciesHome.tsx
index b886171..8012c31 100644
--- a/src/ui/pages/Policies/PoliciesHome.tsx
+++ b/src/ui/pages/Policies/PoliciesHome.tsx
@@ -7,6 +7,7 @@ import { policyNewURL, policyViewURL } from "../pageLinks";
 import { route } from "preact-router";
 import { sendErrorNotification } from "../../elements/ErrorMessage";
 import i18next from "i18next";
+import { InlineButtonBox } from "../../elements/InlineButtonBox";
 
 export class PoliciesHome extends Component<DefaultPageProps, { policies: string[] }> {
   async componentDidMount() {
@@ -32,9 +33,9 @@ export class PoliciesHome extends Component<DefaultPageProps, { policies: string
       <>
         <PageTitle title={i18next.t("policies_home_title")} />
         <div>
-          <p>
+          <InlineButtonBox>
             <Button text={i18next.t("common_new")} color="primary" route={policyNewURL()} />
-          </p>
+          </InlineButtonBox>
 
           <Margin>
             <ul class="uk-nav uk-nav-default">
diff --git a/src/ui/pages/Policies/PolicyView.tsx b/src/ui/pages/Policies/PolicyView.tsx
index 2ce6382..21838cb 100644
--- a/src/ui/pages/Policies/PolicyView.tsx
+++ b/src/ui/pages/Policies/PolicyView.tsx
@@ -7,6 +7,7 @@ import { PageTitle } from "../../elements/PageTitle";
 import { policyDeleteURL, policyEditURL } from "../pageLinks";
 import { sendErrorNotification } from "../../elements/ErrorMessage";
 import i18next from "i18next";
+import { InlineButtonBox } from "../../elements/InlineButtonBox";
 
 export class PolicyView extends Component<
   DefaultPageProps,
@@ -32,7 +33,7 @@ export class PolicyView extends Component<
       <>
         <PageTitle title={i18next.t("policy_view_title", { policy: this.state.policyName })} />
         <div>
-          <p>
+          <InlineButtonBox>
             <Button
               text={i18next.t("common_edit")}
               color="primary"
@@ -45,7 +46,7 @@ export class PolicyView extends Component<
                 route={policyDeleteURL(this.state.policyName)}
               />
             )}
-          </p>
+          </InlineButtonBox>
 
           <Margin>
             <CodeBlock language="hcl" code={this.state.policy} />
diff --git a/src/ui/pages/Secrets/KeyValue/KeyValueList.tsx b/src/ui/pages/Secrets/KeyValue/KeyValueList.tsx
index e746e2b..2f68980 100644
--- a/src/ui/pages/Secrets/KeyValue/KeyValueList.tsx
+++ b/src/ui/pages/Secrets/KeyValue/KeyValueList.tsx
@@ -10,6 +10,7 @@ import { delSecretsEngineURL, kvListURL, kvNewURL, kvViewURL } from "../../pageL
 import { route } from "preact-router";
 import { sendErrorNotification } from "../../../elements/ErrorMessage";
 import i18next from "i18next";
+import { InlineButtonBox } from "../../../elements/InlineButtonBox";
 
 export type KVKeysListProps = DefaultPageProps & {
   baseMount: string;
@@ -190,7 +191,7 @@ export class KeyValueList extends Component<DefaultPageProps, KeyValueListState>
           secretPath={secretPath}
           item={this.props.matches["item"]}
         />
-        <p>
+        <InlineButtonBox>
           {this.state.pathCaps.includes("create") && (
             <Button
               text={i18next.t("kv_view_new_btn")}
@@ -205,7 +206,7 @@ export class KeyValueList extends Component<DefaultPageProps, KeyValueListState>
               route={delSecretsEngineURL(baseMount)}
             />
           )}
-        </p>
+        </InlineButtonBox>
         {this.state.mountType == "cubbyhole" && <p>{i18next.t("kv_view_cubbyhole_text")}</p>}
         <KVKeysList
           settings={this.props.settings}
diff --git a/src/ui/pages/Secrets/SecretsHome.tsx b/src/ui/pages/Secrets/SecretsHome.tsx
index d10dc7b..297c059 100644
--- a/src/ui/pages/Secrets/SecretsHome.tsx
+++ b/src/ui/pages/Secrets/SecretsHome.tsx
@@ -6,6 +6,7 @@ import { PageTitle } from "../../elements/PageTitle";
 import { sendErrorNotification } from "../../elements/ErrorMessage";
 import { sortedObjectMap } from "../../../utils";
 import i18next from "i18next";
+import { InlineButtonBox } from "../../elements/InlineButtonBox";
 
 const supportedMountTypes = ["kv", "totp", "transit", "cubbyhole"];
 
@@ -79,18 +80,16 @@ export class Secrets extends Component<DefaultPageProps, SecretsState> {
         <>
           <PageTitle title={i18next.t("secrets_home_page_title")} />
           <div>
-            <div>
-              <p>
-                {this.state.capabilities.includes("sudo") &&
-                  this.state.capabilities.includes("create") && (
-                    <Button
-                      text={i18next.t("secrets_home_new_secrets_engine_button")}
-                      color="primary"
-                      route={"/secrets/new_secrets_engine"}
-                    />
-                  )}
-              </p>
-            </div>
+            <InlineButtonBox>
+              {this.state.capabilities.includes("sudo") &&
+                this.state.capabilities.includes("create") && (
+                  <Button
+                    text={i18next.t("secrets_home_new_secrets_engine_button")}
+                    color="primary"
+                    route={"/secrets/new_secrets_engine"}
+                  />
+                )}
+            </InlineButtonBox>
             <div class="uk-margin-top">
               <ul class="uk-nav uk-nav-default">
                 {Array.from(this.state.mountsMap).map((args: [string, MountType]) => {
diff --git a/src/ui/pages/Secrets/TOTP/TOTPList.tsx b/src/ui/pages/Secrets/TOTP/TOTPList.tsx
index ebcef21..c201cfc 100644
--- a/src/ui/pages/Secrets/TOTP/TOTPList.tsx
+++ b/src/ui/pages/Secrets/TOTP/TOTPList.tsx
@@ -17,6 +17,7 @@ import {
 import { removeDoubleSlash } from "../../../../utils";
 import { sendErrorNotification } from "../../../elements/ErrorMessage";
 import i18next from "i18next";
+import { InlineButtonBox } from "../../../elements/InlineButtonBox";
 
 type TOTPGridItemProps = DefaultPageProps & {
   baseMount: string;
@@ -206,7 +207,7 @@ export class TOTPList extends Component<DefaultPageProps, TOTPListState> {
       <>
         <SecretTitleElement type="totp" baseMount={baseMount} />
         <div>
-          <p>
+          <InlineButtonBox>
             {totpCaps.includes("create") && (
               <Button
                 text={i18next.t("common_new")}
@@ -228,7 +229,7 @@ export class TOTPList extends Component<DefaultPageProps, TOTPListState> {
                 route={delSecretsEngineURL(baseMount)}
               />
             )}
-          </p>
+          </InlineButtonBox>
           <div>
             <TOTPListView {...this.props} totpItems={this.state.totpItems} />
           </div>
diff --git a/src/ui/pages/Secrets/Transit/TransitList.tsx b/src/ui/pages/Secrets/Transit/TransitList.tsx
index 150c92d..d014c55 100644
--- a/src/ui/pages/Secrets/Transit/TransitList.tsx
+++ b/src/ui/pages/Secrets/Transit/TransitList.tsx
@@ -7,6 +7,7 @@ import { delSecretsEngineURL, transitNewSecretURL, transitViewSecretURL } from "
 import { route } from "preact-router";
 import { sendErrorNotification } from "../../../elements/ErrorMessage";
 import i18next from "i18next";
+import { InlineButtonBox } from "../../../elements/InlineButtonBox";
 
 type TransitViewListState = {
   contentLoaded: boolean;
@@ -96,7 +97,7 @@ export class TransitList extends Component<DefaultPageProps, { caps: Capabilitie
       <>
         <SecretTitleElement type="transit" baseMount={baseMount} />
 
-        <p>
+        <InlineButtonBox>
           {transitCaps.includes("create") && (
             <Button
               text={i18next.t("common_new")}
@@ -111,7 +112,7 @@ export class TransitList extends Component<DefaultPageProps, { caps: Capabilitie
               route={delSecretsEngineURL(baseMount)}
             />
           )}
-        </p>
+        </InlineButtonBox>
         <TransitViewListItem
           settings={this.props.settings}
           api={this.props.api}
diff --git a/src/ui/pages/Settings/KVLoadExportSettings.tsx b/src/ui/pages/Settings/KVLoadExportSettings.tsx
new file mode 100644
index 0000000..6adf9b8
--- /dev/null
+++ b/src/ui/pages/Settings/KVLoadExportSettings.tsx
@@ -0,0 +1,9 @@
+import { Component } from "preact";
+import { DefaultPageProps } from "../../../types/DefaultPageProps";
+
+export class KVLoadExportSettings extends Component<DefaultPageProps> {
+    render() {
+        // TODO: Do This
+        return <></>;
+    }
+}
diff --git a/src/ui/pages/Settings/Settings.tsx b/src/ui/pages/Settings/Settings.tsx
index 4bfc620..a1002ab 100644
--- a/src/ui/pages/Settings/Settings.tsx
+++ b/src/ui/pages/Settings/Settings.tsx
@@ -6,6 +6,7 @@ import { KeyValueSettings } from "./KeyValue/KeyValueSettings";
 import { PageTitle } from "../../elements/PageTitle";
 import UIkit from "uikit";
 import i18next from "i18next";
+import { KVLoadExportSettings } from "./KVLoadExportSettings";
 
 export function settingsSavedNotification() {
   UIkit.notification(i18next.t("settings_saved_notification"), {
@@ -22,6 +23,7 @@ export class Settings extends Component<DefaultPageProps> {
         <Grid size={GridSizes.NORMAL}>
           <GeneralSettings {...this.props} />
           <KeyValueSettings {...this.props} />
+          {/*<KVLoadExportSettings {...this.props} />*/}
         </Grid>
       </>
     );