diff --git a/src/layout/card/content/NitroCardContentView.tsx b/src/layout/card/content/NitroCardContentView.tsx
index 63599b76..573522ef 100644
--- a/src/layout/card/content/NitroCardContentView.tsx
+++ b/src/layout/card/content/NitroCardContentView.tsx
@@ -4,7 +4,7 @@ import { NitroCardContentViewProps } from './NitroCardContextView.types';
 export const NitroCardContentView: FC<NitroCardContentViewProps> = props =>
 {
     return (
-        <div className="bg-light rounded-bottom border border-top-0 px-3 py-2 shadow overflow-hidden content-area">
+        <div className="bg-light rounded-bottom border border-top-0 p-2 shadow overflow-hidden content-area">
             { props.children }
         </div>
     );
diff --git a/src/layout/card/header/NitroCardHeaderView.tsx b/src/layout/card/header/NitroCardHeaderView.tsx
index 707ab8e2..a2306f63 100644
--- a/src/layout/card/header/NitroCardHeaderView.tsx
+++ b/src/layout/card/header/NitroCardHeaderView.tsx
@@ -6,7 +6,7 @@ export const NitroCardHeaderView: FC<NitroCardHeaderViewProps> = props =>
     const { headerText = null, onCloseClick = null } = props;
 
     return (
-        <div className="drag-handler d-flex align-items-center bg-primary border border-bottom-0 rounded-top px-3 py-1">
+        <div className="drag-handler d-flex align-items-center bg-primary border border-bottom-0 rounded-top px-2 py-1">
             <div className="d-flex flex-grow-1 justify-content-center align-items-center">
                 <div className="h4 m-0 text-white text-shadow">{ headerText }</div>
             </div>
diff --git a/src/layout/card/tabs/NitroCardTabsView.tsx b/src/layout/card/tabs/NitroCardTabsView.tsx
index 8615045b..5b9d8583 100644
--- a/src/layout/card/tabs/NitroCardTabsView.tsx
+++ b/src/layout/card/tabs/NitroCardTabsView.tsx
@@ -4,7 +4,7 @@ import { NitroCardTabsViewProps } from './NitroCardTabsView.types';
 export const NitroCardTabsView: FC<NitroCardTabsViewProps> = props =>
 {
     return (
-        <ul className="nav nav-tabs justify-content-center bg-secondary border-start border-end px-3 pt-1">
+        <ul className="nav nav-tabs justify-content-center bg-secondary border-start border-end px-2 pt-1">
             { props.children }
         </ul>
     );
diff --git a/src/layout/card/tabs/tabs-item/NitroCardTabsItemView.types.ts b/src/layout/card/tabs/tabs-item/NitroCardTabsItemView.types.ts
index 1b6b86e0..94debcd4 100644
--- a/src/layout/card/tabs/tabs-item/NitroCardTabsItemView.types.ts
+++ b/src/layout/card/tabs/tabs-item/NitroCardTabsItemView.types.ts
@@ -2,7 +2,7 @@ import { MouseEventHandler } from 'react';
 
 export interface NitroCardTabsItemViewProps
 {
-    tabText: string;
-    isActive: boolean;
-    onClick: MouseEventHandler<HTMLLIElement>;
+    tabText?: string;
+    isActive?: boolean;
+    onClick?: MouseEventHandler<HTMLLIElement>;
 }