diff --git a/app/(tabs)/(stats)/index.tsx b/app/(tabs)/(stats)/index.tsx
index fc96d1a..6a6c0c9 100644
--- a/app/(tabs)/(stats)/index.tsx
+++ b/app/(tabs)/(stats)/index.tsx
@@ -1,30 +1,24 @@
 import React from 'react';
 import { SafeAreaView } from 'react-native';
 import { Graph } from '../../../components';
+import BudgetOverview from '../../../components/stats/BudgetOverview';
+import BudgetRemaining from '../../../components/stats/BudgetRemaining';
+import SavingsOverview from '../../../components/stats/SavingsOverview';
+import Widget from '../../../components/stats/Widget';
 
 export default function Page() {
 
     return (
         <SafeAreaView style={{flex: 1}}>
-
+            <Widget title="Budget Overview"/>
             <Graph/>
-
-
-                {/* <DebugMenu />
-                <Widget title='"Financial" Tips' backgroundColor='orange'>
-                    <FinancialAdvice/>
-                </Widget>
-                <Widget title="Budget Overview" />
-                <Widget>
-                    <BudgetRemaining/>
-                </Widget>
-                <Widget title='Your Expenses so far' image={require('../../../assets/images/8b14el.jpg')}/>
-                <Widget>
-                    <BudgetOverview/>
-                </Widget>
-                <Widget>
-                    <SavingsOverview/>
-                </Widget> */}
+            <BudgetRemaining/>
+            <Widget>
+                <BudgetOverview/>
+            </Widget>
+            <Widget>
+                <SavingsOverview/>
+            </Widget>
         </SafeAreaView>
     );
 }
diff --git a/app/(tabs)/_layout.tsx b/app/(tabs)/_layout.tsx
index 103e5ac..62d5907 100644
--- a/app/(tabs)/_layout.tsx
+++ b/app/(tabs)/_layout.tsx
@@ -3,9 +3,9 @@ import { StyleSheet } from "react-native";
 
 import { FontAwesome } from "@expo/vector-icons";
 import { Redirect } from "expo-router";
-import React, { useEffect } from "react";
-import { useTheme } from "../contexts/ThemeContext";
+import React from "react";
 import { useAuth } from "../contexts/AuthContext";
+import { useTheme } from "../contexts/ThemeContext";
 
 export default function Layout() {
     const {authState} = useAuth()
@@ -52,6 +52,7 @@ export default function Layout() {
             <Tabs.Screen name="(stats)/index" options={
                 {
                     tabBarLabel: "Stats",
+                    unmountOnBlur: true,
                     tabBarIcon: ({size, color}) => (
                         <FontAwesome name="bar-chart" size={size} color={color}/>),
                 }