diff --git a/client/src/cartridgeConnector.tsx b/client/src/cartridgeConnector.tsx
index be6ee00..657fbd8 100644
--- a/client/src/cartridgeConnector.tsx
+++ b/client/src/cartridgeConnector.tsx
@@ -8,6 +8,7 @@ const {
   VITE_PUBLIC_GAME_TOKEN_ADDRESS,
   VITE_PUBLIC_GAME_CREDITS_TOKEN_ADDRESS,
   VITE_PUBLIC_NODE_URL,
+  VITE_PUBLIC_DEPLOY_TYPE,
 } = import.meta.env;
 
 export type Manifest = typeof manifest;
@@ -15,7 +16,7 @@ export type Manifest = typeof manifest;
 const colorMode: ColorMode = "dark";
 const theme = "zkube";
 const namespace = "zkube";
-const slot = "zkube-slotdev";
+const slot = `zkube-${VITE_PUBLIC_DEPLOY_TYPE}`;
 
 const account_contract_address = getContractByName(
   manifest,
diff --git a/client/src/ui/actions/Start.tsx b/client/src/ui/actions/Start.tsx
index a7c537c..9256801 100644
--- a/client/src/ui/actions/Start.tsx
+++ b/client/src/ui/actions/Start.tsx
@@ -1,6 +1,6 @@
 import { useDojo } from "@/dojo/useDojo";
-import { useCallback, useMemo, useState, useEffect } from "react";
-import { Account, BlockTag } from "starknet";
+import { useCallback, useMemo, useState } from "react";
+import { Account } from "starknet";
 import { Button } from "@/ui/elements/button";
 import { useGame } from "@/hooks/useGame";
 import { usePlayer } from "@/hooks/usePlayer";
diff --git a/client/src/ui/components/Controller.tsx b/client/src/ui/components/Controller.tsx
index b72fa30..72b0c0c 100644
--- a/client/src/ui/components/Controller.tsx
+++ b/client/src/ui/components/Controller.tsx
@@ -1,6 +1,6 @@
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Button } from "../elements/button";
-import { faWallet } from "@fortawesome/free-solid-svg-icons";
+import { faTrophy } from "@fortawesome/free-solid-svg-icons";
 import { useCallback } from "react";
 import { useAccount } from "@starknet-react/core";
 
@@ -16,7 +16,7 @@ export const Controller = () => {
 
   return (
     <Button variant="shimmer" onClick={() => handleTrophyClick()}>
-      <FontAwesomeIcon icon={faWallet} />
+      <FontAwesomeIcon icon={faTrophy} />
     </Button>
   );
 };
diff --git a/client/src/ui/components/DesktopHeader.tsx b/client/src/ui/components/DesktopHeader.tsx
index 1e2ffdf..1515dc9 100644
--- a/client/src/ui/components/DesktopHeader.tsx
+++ b/client/src/ui/components/DesktopHeader.tsx
@@ -10,7 +10,6 @@ import { useCallback, useState } from "react";
 import LevelIndicator from "./LevelIndicator";
 import SettingsDropDown from "./SettingsDropDown";
 import { useNavigate } from "react-router-dom";
-import HeaderNftBalance from "./HeaderNftBalance";
 import { Controller } from "./Controller";
 
 const DesktopHeader = () => {
diff --git a/client/src/ui/elements/button/variants.ts b/client/src/ui/elements/button/variants.ts
index 035f75d..076235b 100644
--- a/client/src/ui/elements/button/variants.ts
+++ b/client/src/ui/elements/button/variants.ts
@@ -18,7 +18,7 @@ export const buttonVariants = cva(
         brutal:
           "px-8 py-0.5  border-2 border-black dark:border-white uppercase bg-white text-black transition duration-200 text-sm shadow-[1px_1px_rgba(0,0,0),2px_2px_rgba(0,0,0),3px_3px_rgba(0,0,0),4px_4px_rgba(0,0,0),5px_5px_0px_0px_rgba(0,0,0)] dark:shadow-[1px_1px_rgba(255,255,255),2px_2px_rgba(255,255,255),3px_3px_rgba(255,255,255),4px_4px_rgba(255,255,255),5px_5px_0px_0px_rgba(255,255,255)] ",
         shimmer:
-          "inline-flex h-12 animate-shimmer items-center justify-center rounded-md border border-slate-800 bg-[linear-gradient(110deg,#000103,45%,#1e2631,55%,#000103)] bg-[length:200%_100%] px-6 font-medium text-slate-400 transition-colors focus:outline-none focus:ring-2 focus:ring-slate-400 focus:ring-offset-2 focus:ring-offset-slate-50",
+          "inline-flex h-12 animate-shimmer items-center justify-center rounded-md border border-slate-800 bg-[linear-gradient(110deg,#000103,45%,#1e2631,55%,#000103)] bg-[length:200%_100%] px-6 font-medium text-slate-400 transition-colors focus:outline-none hover:bg-none hover:bg-accent",
       },
       size: {
         default: "h-9 px-4 py-2",
diff --git a/client/src/ui/modules/Leaderboard.tsx b/client/src/ui/modules/Leaderboard.tsx
index 30b05cc..0ba7336 100644
--- a/client/src/ui/modules/Leaderboard.tsx
+++ b/client/src/ui/modules/Leaderboard.tsx
@@ -102,7 +102,7 @@ export const Leaderboard: React.FC<LeaderboardProps> = ({
 };
 
 export const LeaderboardContent: React.FC = () => {
-  const [activeTab, setActiveTab] = useState<ModeType>(ModeType.Daily);
+  const [activeTab, setActiveTab] = useState<ModeType>(ModeType.Free);
   const isMdorLarger = useMediaQuery({ query: "(min-width: 768px)" });
 
   const {