diff --git a/chartlets.js/CHANGES.md b/chartlets.js/CHANGES.md
index 07bd107..0c798a6 100644
--- a/chartlets.js/CHANGES.md
+++ b/chartlets.js/CHANGES.md
@@ -16,8 +16,11 @@
 
 * Typology component now allows color and text arguments. 
   If a user uses text and children, the text argument replaces the 
-  children. 
+  children.
   
+* Applied changes to the return value of `Tabs` component and added 
+  demo panel H, that showcases the use of `Tabs` component. (#129).
+
 ## Version 0.1.6 (from 2025/06/18)
 
 * Implemented dynamic resizing for Vega Charts when the side panel's 
diff --git a/chartlets.js/packages/lib/src/plugins/mui/Tabs.tsx b/chartlets.js/packages/lib/src/plugins/mui/Tabs.tsx
index 355c304..bf3367a 100644
--- a/chartlets.js/packages/lib/src/plugins/mui/Tabs.tsx
+++ b/chartlets.js/packages/lib/src/plugins/mui/Tabs.tsx
@@ -1,9 +1,11 @@
+import MuiBox from "@mui/material/Box";
 import MuiIcon from "@mui/material/Icon";
 import MuiTabs from "@mui/material/Tabs";
 import MuiTab from "@mui/material/Tab";
 
 import type { ComponentProps, ComponentState } from "@/index";
 import type { SyntheticEvent } from "react";
+import { Box } from "@/plugins/mui/Box";
 import { isString } from "@/utils/isString";
 import { isComponentState } from "@/types/state/component";
 
@@ -12,6 +14,7 @@ interface TabState {
   label?: string;
   icon?: string;
   disabled?: boolean;
+  children?: ComponentProps[];
 }
 
 interface TabsState extends ComponentState {
@@ -41,19 +44,40 @@ export function Tabs({
     }
   };
   return (
-    <MuiTabs id={id} style={style} value={value} onChange={handleChange}>
-      {tabItems?.map((tab) => {
+    <MuiBox sx={{ width: "100%" }}>
+      <MuiBox sx={{ borderBottom: 1, borderColor: "divider" }}>
+        <MuiTabs id={id} style={style} value={value} onChange={handleChange}>
+          {tabItems?.map((tab, index) => {
+            const tabState = isComponentState(tab)
+              ? (tab as TabState)
+              : undefined;
+            return (
+              <MuiTab
+                key={index}
+                label={tabState ? tabState.label : isString(tab) ? tab : ""}
+                icon={
+                  tabState &&
+                  tabState.icon && <MuiIcon>{tabState.icon}</MuiIcon>
+                }
+                disabled={disabled || (tabState && tabState.disabled)}
+              />
+            );
+          })}
+        </MuiTabs>
+      </MuiBox>
+      {tabItems?.map((tab, index) => {
         const tabState = isComponentState(tab) ? (tab as TabState) : undefined;
         return (
-          <MuiTab
-            label={tabState ? tabState.label : isString(tab) ? tab : ""}
-            icon={
-              tabState && tabState.icon && <MuiIcon>{tabState.icon}</MuiIcon>
-            }
-            disabled={disabled || (tabState && tabState.disabled)}
-          />
+          value === index && (
+            <Box
+              key={index}
+              type={type}
+              onChange={onChange}
+              children={tabState?.children ?? undefined}
+            />
+          )
         );
       })}
-    </MuiTabs>
+    </MuiBox>
   );
 }
diff --git a/chartlets.py/demo/my_extension/__init__.py b/chartlets.py/demo/my_extension/__init__.py
index 5c9f47d..2cdb6cd 100644
--- a/chartlets.py/demo/my_extension/__init__.py
+++ b/chartlets.py/demo/my_extension/__init__.py
@@ -6,6 +6,7 @@
 from .my_panel_5 import panel as my_panel_5
 from .my_panel_6 import panel as my_panel_6
 from .my_panel_7 import panel as my_panel_7
+from .my_panel_8 import panel as my_panel_8
 
 
 ext = Extension(__name__)
@@ -16,3 +17,4 @@
 ext.add(my_panel_5)
 ext.add(my_panel_6)
 ext.add(my_panel_7)
+ext.add(my_panel_8)
diff --git a/chartlets.py/demo/my_extension/my_panel_8.py b/chartlets.py/demo/my_extension/my_panel_8.py
new file mode 100644
index 0000000..ac3907b
--- /dev/null
+++ b/chartlets.py/demo/my_extension/my_panel_8.py
@@ -0,0 +1,69 @@
+import altair as alt
+
+from chartlets import Component, Input, State, Output
+from chartlets.components import (Tabs, Tab, Typography, Box,
+                                  VegaChart, Table)
+from chartlets.components.table import TableColumn, TableRow
+
+from server.context import Context
+from server.panel import Panel
+
+
+panel = Panel(__name__, title="Panel H")
+
+
+@panel.layout(State("@app", "selectedDatasetId"))
+def render_panel(
+    ctx: Context,
+    selected_dataset_id: str = "",
+) -> Component:
+    dataset = ctx.datasets.get(selected_dataset_id)
+
+    columns: list[TableColumn] = [
+        {"id": "id", "label": "ID", "sortDirection": "desc"},
+        {
+            "id": "firstName",
+            "label": "First Name",
+            "align": "left",
+            "sortDirection": "desc",
+        },
+        {"id": "lastName", "label": "Last Name", "align": "center"},
+        {"id": "age", "label": "Age"},
+    ]
+
+    rows: TableRow = [
+        ["1", "John", "Doe", 30],
+        ["2", "Jane", "Smith", 25],
+        ["3", "Peter", "Jones", 40],
+    ]
+
+    table = Table(id="table", rows=rows, columns=columns, hover=True)
+
+    info_text = Typography(id="info_text", children=["This is a text."])
+    chart = VegaChart(
+        id="chart", chart=(
+        alt.Chart(dataset)
+        .mark_bar()
+        .encode(
+            x=alt.X("x:N", title="x"),
+            y=alt.Y("a:Q", title="a"))
+        .properties(width=290, height=300, title="Vega charts")
+    ), style={"flexGrow": 1}
+    )
+
+    tab1 = Tab(id = "tab1", label="Tab 1", children=[table])
+    tab2 = Tab(id = "tab2", label="Tab 2", children=[info_text])
+    tab3 = Tab(id="tab3", label="Tab 3", children=[chart])
+
+    tabs = Tabs(id = "tabs", value = 0, children=[tab1,tab2,tab3])
+
+    return Box(
+        style={
+            "display": "flex",
+            "flexDirection": "column",
+            "width": "100%",
+            "height": "100%",
+        },
+        children=[ tabs ],
+    )
+