diff --git a/package.json b/package.json
index 80367ff..c1e4126 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "wealthfolio-app",
   "private": true,
-  "version": "1.0.6",
+  "version": "1.0.7",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 1eb72f0..741a7a3 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -4352,7 +4352,7 @@ dependencies = [
 
 [[package]]
 name = "wealthfolio-app"
-version = "1.0.6"
+version = "1.0.7"
 dependencies = [
  "chrono",
  "csv",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index c2b802c..bc72b7d 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "wealthfolio-app"
-version = "1.0.6"
+version = "1.0.7"
 description = "Portfolio tracker"
 authors = ["Aziz Fadil"]
-license = "MIT"
+license = "LGPL-3.0"
 repository = ""
 edition = "2021"
 
diff --git a/src-tauri/src/asset/asset_service.rs b/src-tauri/src/asset/asset_service.rs
index d1190f3..052be71 100644
--- a/src-tauri/src/asset/asset_service.rs
+++ b/src-tauri/src/asset/asset_service.rs
@@ -328,13 +328,15 @@ impl AssetService {
 
             for yahoo_quote in quotes_history {
                 let timestamp = yahoo_quote.timestamp as i64;
+                let naive_datetime = chrono::DateTime::from_timestamp(timestamp, 0)
+                    .ok_or_else(|| format!("Invalid timestamp: {}", timestamp))?
+                    .naive_utc();
+
                 let new_quote = Quote {
                     id: uuid::Uuid::new_v4().to_string(),
-                    created_at: chrono::NaiveDateTime::from_timestamp_opt(timestamp, 0)
-                        .ok_or_else(|| format!("Invalid timestamp: {}", timestamp))?,
+                    created_at: naive_datetime,
                     data_source: "YAHOO".to_string(),
-                    date: chrono::NaiveDateTime::from_timestamp_opt(timestamp, 0)
-                        .ok_or_else(|| format!("Invalid date timestamp: {}", timestamp))?,
+                    date: naive_datetime,
                     symbol: symbol.to_string(),
                     open: yahoo_quote.open,
                     high: yahoo_quote.high,
diff --git a/src-tauri/src/models.rs b/src-tauri/src/models.rs
index 00676c9..b314326 100644
--- a/src-tauri/src/models.rs
+++ b/src-tauri/src/models.rs
@@ -1,6 +1,5 @@
 use chrono::NaiveDateTime;
 use diesel::prelude::*;
-use diesel::sql_types::{Double, Nullable, Text};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 #[derive(Queryable, Identifiable, AsChangeset, Serialize, Deserialize, Debug)]
@@ -327,24 +326,6 @@ pub struct Holding {
     pub sectors: Option<Vec<Sector>>,
 }
 
-#[derive(QueryableByName, Debug)]
-pub struct AggregatedHolding {
-    #[diesel(sql_type = Text)]
-    pub account_id: String,
-    #[diesel(sql_type = Text)]
-    pub account_name: String,
-    #[diesel(sql_type = Text)]
-    pub asset_id: String,
-    #[diesel(sql_type = Text)]
-    pub asset_name: String, // Assuming this is the field name for asset_symbol
-    #[diesel(sql_type = Nullable<Double>)]
-    pub quantity: Option<f64>,
-    #[diesel(sql_type = Double)]
-    pub book_value: f64,
-    #[diesel(sql_type = Nullable<Double>)]
-    pub average_cost: Option<f64>,
-}
-
 // FinancialSnapshot and FinancialHistory structs with serde for serialization/deserialization
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(rename_all = "camelCase")]
diff --git a/src-tauri/src/portfolio/portfolio_service.rs b/src-tauri/src/portfolio/portfolio_service.rs
index 0af0581..8a7a2a2 100644
--- a/src-tauri/src/portfolio/portfolio_service.rs
+++ b/src-tauri/src/portfolio/portfolio_service.rs
@@ -416,8 +416,8 @@ impl PortfolioService {
                         cumulative_cash += activity_amount * activity.unit_price - activity_fee;
                     }
                     "WITHDRAWAL" | "TRANSFER_OUT" | "CONVERSION_OUT" => {
-                        cumulative_cash -= activity_amount + activity_fee;
-                        net_deposit -= activity_amount;
+                        cumulative_cash -= activity_amount * activity.unit_price + activity_fee;
+                        net_deposit -= activity_amount * activity.unit_price;
                     }
                     "FEE" | "TAX" => {
                         cumulative_cash -= activity_fee;
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 44fcab5..6611476 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Wealthfolio",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   "tauri": {
     "allowlist": {
diff --git a/src/lib/schemas.ts b/src/lib/schemas.ts
index ba604f9..660dafa 100644
--- a/src/lib/schemas.ts
+++ b/src/lib/schemas.ts
@@ -34,9 +34,9 @@ export const newGoalSchema = z.object({
 
 export const newActivitySchema = z.object({
   id: z.string().uuid().optional(),
-  accountId: z.string(),
+  accountId: z.string().min(1, { message: 'Account ID is required' }),
   activityDate: z.date(),
-  currency: z.string(),
+  currency: z.string().min(1, { message: 'Currency is required' }),
   fee: z.coerce
     .number({
       required_error: 'Please enter a valid fee.',
@@ -51,7 +51,7 @@ export const newActivitySchema = z.object({
       invalid_type_error: 'Quantity must be a positive number.',
     })
     .min(0, { message: 'Quantity must be a positive number.' }),
-  assetId: z.string(),
+  assetId: z.string().min(1, { message: 'Asset ID is required' }),
   activityType: z.enum([
     'BUY',
     'SELL',
diff --git a/src/pages/activity/activity-page.tsx b/src/pages/activity/activity-page.tsx
index 8b324ab..310c177 100644
--- a/src/pages/activity/activity-page.tsx
+++ b/src/pages/activity/activity-page.tsx
@@ -9,7 +9,6 @@ import ActivityTable from './components/activity-table';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { Account, ActivityDetails } from '@/lib/types';
 import { getAccounts } from '@/commands/account';
-// import { getActivities } from '@/commands/activity';
 import { ActivityDeleteModal } from './components/activity-delete-modal';
 import { deleteActivity } from '@/commands/activity';
 import { toast } from '@/components/ui/use-toast';
@@ -65,15 +64,15 @@ const ActivityPage = () => {
     <div className="flex flex-col p-6">
       <ApplicationHeader heading="Activity">
         <div className="flex items-center space-x-2">
-          <Button variant="outline" size="sm" title="Import" asChild>
+          <Button size="sm" title="Import" asChild>
             <Link to={'/import'}>
-              <Icons.Import className="h-4 w-4" />
-              <span className="sr-only">Import</span>
+              <Icons.Import className="mr-2 h-4 w-4" />
+              Upload CSV
             </Link>
           </Button>
-          <Button size="sm" onClick={() => setShowEditModal(true)}>
+          <Button variant="outline" size="sm" onClick={() => setShowEditModal(true)}>
             <Icons.PlusCircle className="mr-2 h-4 w-4" />
-            Add Activity
+            Add Manually
           </Button>
         </div>
       </ApplicationHeader>
@@ -97,7 +96,10 @@ const ActivityPage = () => {
         }
         activity={selectedActivity}
         open={showEditModal}
-        onClose={() => setShowEditModal(false)}
+        onClose={() => {
+          setShowEditModal(false);
+          setSelectedActivity(null);
+        }}
       />
       <ActivityDeleteModal
         isOpen={showDeleteAlert}
diff --git a/src/pages/activity/import/import-form.tsx b/src/pages/activity/import/import-form.tsx
index 0831891..c93eff0 100644
--- a/src/pages/activity/import/import-form.tsx
+++ b/src/pages/activity/import/import-form.tsx
@@ -4,6 +4,7 @@ import { useForm } from 'react-hook-form';
 import * as z from 'zod';
 import { open } from '@tauri-apps/api/dialog';
 import { listen, Event, UnlistenFn } from '@tauri-apps/api/event';
+import { Link } from 'react-router-dom';
 
 import { EmptyPlaceholder } from '@/components/empty-placeholder';
 
@@ -204,19 +205,27 @@ export const ActivityImportForm = ({ onSuccess, onError }: ActivityImportFormPro
             </FormItem>
           )}
         />
-        <Button type="submit" disabled={isLoading}>
-          {isLoading ? (
-            <>
-              <Icons.Spinner className="mr-2 h-4 w-4 animate-spin" />
-              <span className="hidden sm:ml-2 sm:inline">Validating activities...</span>
-            </>
-          ) : (
-            <>
-              <Icons.Import className="mr-2 h-4 w-4" />
-              <span className="hidden sm:ml-2 sm:inline">Import activities</span>
-            </>
-          )}
-        </Button>
+        <div className="flex space-x-4">
+          <Button type="button" variant="outline" asChild>
+            <Link to="/activities">
+              {/* <Icons.ArrowLeft className="mr-2 h-4 w-4" /> */}
+              <span className="hidden sm:ml-2 sm:inline">Cancel</span>
+            </Link>
+          </Button>
+          <Button type="submit" disabled={isLoading}>
+            {isLoading ? (
+              <>
+                <Icons.Spinner className="mr-2 h-4 w-4 animate-spin" />
+                <span className="hidden sm:ml-2 sm:inline">Validating activities...</span>
+              </>
+            ) : (
+              <>
+                <Icons.Import className="mr-2 h-4 w-4" />
+                <span className="hidden sm:ml-2 sm:inline">Import activities</span>
+              </>
+            )}
+          </Button>
+        </div>
       </form>
     </Form>
   );
diff --git a/src/pages/onboarding/onboarding-page.tsx b/src/pages/onboarding/onboarding-page.tsx
index e764454..040a67b 100644
--- a/src/pages/onboarding/onboarding-page.tsx
+++ b/src/pages/onboarding/onboarding-page.tsx
@@ -10,11 +10,11 @@ export const OnboardingPage = () => {
 
   const renderStepIcon = (stepNumber: number) => {
     return currentStep >= stepNumber ? (
-      <div className="flex h-6 w-6  items-center justify-center rounded-full bg-green-500">
+      <div className="flex h-6 w-6 items-center justify-center rounded-full bg-green-500">
         <Icons.CheckCircle className="text-xs text-white" />
       </div>
     ) : (
-      <div className="flex h-6 w-6  items-center justify-center rounded-full bg-foreground/80">
+      <div className="flex h-6 w-6 items-center justify-center rounded-full bg-foreground/80">
         <span className="text-xs text-white">{stepNumber}</span>
       </div>
     );
@@ -22,7 +22,7 @@ export const OnboardingPage = () => {
 
   return (
     <section className="flex min-h-screen items-center justify-center pb-16">
-      <div className=" flex max-w-4xl flex-col space-x-6  md:flex-row md:items-center ">
+      <div className="flex max-w-4xl flex-col space-x-6 md:flex-row md:items-center">
         <div className="md:flex md:w-1/4 md:items-center md:justify-center">
           <img
             alt="Illustration"
@@ -37,7 +37,7 @@ export const OnboardingPage = () => {
           />
         </div>
         <div className="space-y-6 md:w-3/4">
-          <h1 className="mb-4 text-3xl font-bold text-gray-900 dark:text-gray-100 ">
+          <h1 className="mb-4 text-3xl font-bold text-gray-900 dark:text-gray-100">
             Welcome to Wealthfolio
           </h1>
           <p className="mb-8 text-lg text-gray-600 dark:text-gray-400">
@@ -45,22 +45,21 @@ export const OnboardingPage = () => {
             started:
           </p>
           <div className="mb-8 space-y-6 pl-2">
-            <Link to="/settings/general" className="flex items-center space-x-2">
+            <Link to="/settings/general" className="group flex items-center space-x-2">
               {renderStepIcon(1)}
               <p className="text-gray-700 dark:text-gray-300">Set your main currency</p>
+              <Icons.ArrowRight className="ml-2 h-4 w-4" />
             </Link>
-            <Link to="/settings/accounts" className="flex items-center space-x-2">
-              <div className="flex h-6 w-6  items-center justify-center rounded-full bg-foreground/80">
-                <span className="text-xs text-white">2</span>
-              </div>
+            <Link to="/settings/accounts" className="group flex items-center space-x-2">
+              {renderStepIcon(2)}
               <p className="text-gray-700 dark:text-gray-300">Add your accounts</p>
+              <Icons.ArrowRight className="ml-2 h-4 w-4" />
             </Link>
-            <div className="flex items-center space-x-2">
-              <div className="flex h-6 w-6  items-center justify-center rounded-full bg-foreground/80">
-                <span className="text-xs text-white">3</span>
-              </div>
+            <Link to="/activities" className="group flex items-center space-x-2">
+              {renderStepIcon(3)}
               <p className="text-gray-700 dark:text-gray-300">Add or import activities</p>
-            </div>
+              <Icons.ArrowRight className="ml-2 h-4 w-4" />
+            </Link>
           </div>
           <div>
             <Button className="mt-4" asChild>