Index: backend/src/main/java/com/tradingmk/backend/service/AuthenticationService.java
===================================================================
--- backend/src/main/java/com/tradingmk/backend/service/AuthenticationService.java	(revision aafcffedcc97a67bef8ae12959cff950ba2e4095)
+++ backend/src/main/java/com/tradingmk/backend/service/AuthenticationService.java	(revision a766ca68351d6141a13f1c5cf510034d73548769)
@@ -17,4 +17,6 @@
 
 import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
 
 @Service
@@ -50,7 +52,8 @@
         portfolioRepository.save(portfolio);
 
-
+        Map<String, Object> extraClaims = new HashMap<>();
+        extraClaims.put("email", user.getEmail());
         //final generate token
-        var jwtToken = userService.generateToken(user);
+        var jwtToken = userService.generateToken(extraClaims,user);
         return AuthenticationResponse.builder()
                 .token(jwtToken)
@@ -74,6 +77,8 @@
                 .orElseThrow();
 
-        var jwtToken = userService.generateToken(user);
-        System.out.println("Generated JWT: " + jwtToken);
+        Map<String, Object> extraClaims = new HashMap<>();
+        extraClaims.put("email", user.getEmail());
+        //final generate token
+        var jwtToken = userService.generateToken(extraClaims,user);
         return AuthenticationResponse.builder()
                 .token(jwtToken)
Index: frontend/src/pages/Dashboard/EvaluationSection/EvaluationSection.jsx
===================================================================
--- frontend/src/pages/Dashboard/EvaluationSection/EvaluationSection.jsx	(revision aafcffedcc97a67bef8ae12959cff950ba2e4095)
+++ frontend/src/pages/Dashboard/EvaluationSection/EvaluationSection.jsx	(revision a766ca68351d6141a13f1c5cf510034d73548769)
@@ -103,5 +103,5 @@
                                 <span
                                     className="text-3xl font-bold text-gray-900">{investedInStocks.toLocaleString(undefined, {maximumFractionDigits: 2})} MKD</span>
-                                <TrendingUp className="w-5 h-5 text-green-500"/>
+
                             </div>
                         </div>
Index: frontend/src/pages/Portfolio/Portfolio.jsx
===================================================================
--- frontend/src/pages/Portfolio/Portfolio.jsx	(revision aafcffedcc97a67bef8ae12959cff950ba2e4095)
+++ frontend/src/pages/Portfolio/Portfolio.jsx	(revision a766ca68351d6141a13f1c5cf510034d73548769)
@@ -1,4 +1,4 @@
 import React, {useEffect, useState} from "react";
-import {TrendingUp, Wallet, PlusCircle} from "lucide-react";
+import {TrendingUp, Wallet, PlusCircle,TrendingDown} from "lucide-react";
 import Menu from "../Menu/Menu.jsx";
 import {useParams} from "react-router-dom";
@@ -103,4 +103,6 @@
     }, 0);
 
+
+
     //FOR PERFORAMNFCE
     const currentValue = portfolio.holdings.reduce((sum, h) => {
@@ -108,4 +110,7 @@
         return sum + h.quantity * currentPrice;
     }, 0);
+
+    const totalPortfolioValue = portfolio.balance + currentValue;
+
 
     const totalProfit = currentValue - investedInStocks;
@@ -169,7 +174,23 @@
                             <span
                                 className="text-3xl font-bold text-gray-900">{investedInStocks.toLocaleString(undefined, {maximumFractionDigits: 2})} MKD</span>
-                            <TrendingUp className="w-5 h-5 text-green-500"/>
                         </div>
                     </div>
+
+                    <div className="flex flex-col">
+                        <div className="text-sm text-gray-600">Current portfolio value:</div>
+                        <div className="flex items-baseline gap-3">
+        <span
+            className="text-3xl font-bold text-gray-900">
+            {currentValue.toLocaleString(undefined, {maximumFractionDigits: 2})} MKD
+        </span>
+                            {totalProfit >= 0 ? (
+                                <TrendingUp className="w-5 h-5 text-green-500" />
+                            ) : (
+                                <TrendingDown className="w-5 h-5 text-red-500" />
+                            )}
+                        </div>
+                    </div>
+
+
                 </div>
             </div>
@@ -178,5 +199,5 @@
             <div className="grid grid-cols-2 md:grid-cols-4 gap-6 pt-6 justify-center">
                 <div>
-                    <div className="text-sm text-gray-600">Total Profit</div>
+                    <div className="text-sm text-gray-600">Total Profit / Loss</div>
                     <div className={`font-semibold ${totalProfit >= 0 ? "text-green-600" : "text-red-600"}`}>
                         {totalProfit >= 0 ? "+" : "-"}{Math.abs(totalProfit).toFixed(2)} MKD
@@ -205,17 +226,5 @@
                 </div>
                 <div className="flex space-x-4 mb-6 mt-4 ml-6">
-                    {['1w', '1m'].map((timeframe) => (
-                        <button
-                            key={timeframe}
-                            onClick={() => setSelectedTimeframe(timeframe)}
-                            className={`px-3 py-1 rounded ${
-                                selectedTimeframe === timeframe
-                                    ? 'bg-gray-900 text-white'
-                                    : 'text-gray-500 hover:text-gray-700'
-                            }`}
-                        >
-                            {timeframe}
-                        </button>
-                    ))}
+
                 </div>
                 <div className="p-6 pt-0 grid grid-cols-1 md:grid-cols-2 gap-6">
Index: frontend/src/pages/Settings/Settings.jsx
===================================================================
--- frontend/src/pages/Settings/Settings.jsx	(revision aafcffedcc97a67bef8ae12959cff950ba2e4095)
+++ frontend/src/pages/Settings/Settings.jsx	(revision a766ca68351d6141a13f1c5cf510034d73548769)
@@ -2,15 +2,23 @@
 import {LogOut, User, Mail } from "lucide-react";
 import Menu from "../Menu/Menu.jsx";
+import {jwtDecode} from "jwt-decode";
+import {useNavigate} from "react-router-dom";
 
 const Settings = () => {
-    const user = {
-        username: "davor1",
-        email: "davor@gmail.com",
-    };
+    const navigate = useNavigate();
 
-    const handleLogout = () => {
-        //need to remove token from localStorage, fix it !!!
-        window.location.href = "/";
-    };
+
+
+
+    const token = localStorage.getItem('accessToken');
+    let username = '';
+    let email = '';
+
+    if (token) {
+        const decoded = jwtDecode(token);
+        username = decoded.sub;
+        email = decoded.email;//username
+
+    }
 
     return (
@@ -24,5 +32,5 @@
                     <div>
                         <div className="text-sm text-gray-600">Username</div>
-                        <div className="font-semibold text-gray-900">{user.username}</div>
+                        <div className="font-semibold text-gray-900">{username}</div>
                     </div>
                 </div>
@@ -33,5 +41,5 @@
                     <div>
                         <div className="text-sm text-gray-600">Email</div>
-                        <div className="font-semibold text-gray-900">{user.email}</div>
+                        <div className="font-semibold text-gray-900">{email}</div>
                     </div>
                 </div>
@@ -46,8 +54,8 @@
                 </div>
                 <button
-                    onClick={handleLogout}
+                    onClick={() => {localStorage.removeItem('accessToken'); console.log("removed"); navigate("/")}}
                     className="flex items-center gap-2 bg-red-500 hover:bg-red-600 text-white px-4 py-2 rounded-lg cursor-pointer"
                 >
-                    <LogOut className="w-5 h-5" />
+                    <LogOut className="w-5 h-5"  />
                     Logout
                 </button>