diff --git a/src/views/Lending/Cooler/positions/Positions.tsx b/src/views/Lending/Cooler/positions/Positions.tsx
index c944ee3cf..f69e0d1b8 100644
--- a/src/views/Lending/Cooler/positions/Positions.tsx
+++ b/src/views/Lending/Cooler/positions/Positions.tsx
@@ -1,10 +1,8 @@
 import {
   Box,
   Grid,
-  MenuItem,
   Paper,
-  Select,
-  Skeleton,
+  SvgIcon,
   Table,
   TableBody,
   TableCell,
@@ -12,11 +10,11 @@ import {
   TableHead,
   TableRow,
   Typography,
-  useTheme,
 } from "@mui/material";
 import { OHMTokenProps, PrimaryButton, SecondaryButton, Token } from "@olympusdao/component-library";
 import { ethers } from "ethers";
-import { useEffect, useState } from "react";
+import { useState } from "react";
+import usdsIcon from "src/assets/tokens/usds.svg?react";
 import { BorrowRate, OutstandingPrincipal, WeeklyCapacityRemaining } from "src/views/Lending/Cooler/dashboard/Metrics";
 import { useGetClearingHouse } from "src/views/Lending/Cooler/hooks/useGetClearingHouse";
 import { useGetCoolerForWallet } from "src/views/Lending/Cooler/hooks/useGetCoolerForWallet";
@@ -27,8 +25,6 @@ import { useAccount } from "wagmi";
 
 export const CoolerPositions = () => {
   const { address } = useAccount();
-  const [currentClearingHouse, setCurrentClearingHouse] = useState<"v1" | "v2" | "v3">("v3");
-  // Get clearing house data for all versions
   const clearingHouses = {
     v1: useGetClearingHouse({ clearingHouse: "clearingHouseV1" }).data,
     v2: useGetClearingHouse({ clearingHouse: "clearingHouseV2" }).data,
@@ -81,46 +77,60 @@ export const CoolerPositions = () => {
     clearingHouseVersion: "clearingHouseV3",
   });
 
-  // Organize version data
-  const versionData = {
-    v1: {
-      loans: { data: loansV1, isFetched: isFetchedLoansV1 },
-      coolerAddress: { data: coolerAddressV1 },
-    },
-    v2: {
-      loans: { data: loansV2, isFetched: isFetchedLoansV2 },
-      coolerAddress: { data: coolerAddressV2 },
-    },
-    v3: {
-      loans: { data: loansV3, isFetched: isFetchedLoansV3 },
-      coolerAddress: { data: coolerAddressV3 },
-    },
+  const [extendLoan, setExtendLoan] = useState<ReturnType<typeof getAllLoans>[number] | undefined>(undefined);
+  const [repayLoan, setRepayLoan] = useState<ReturnType<typeof getAllLoans>[number] | undefined>(undefined);
+
+  const getAllLoans = () => {
+    const allLoans = [
+      ...(loansV1 || []).map(loan => ({ ...loan, version: "v1" })),
+      ...(loansV2 || []).map(loan => ({ ...loan, version: "v2" })),
+      ...(loansV3 || []).map(loan => ({ ...loan, version: "v3" })),
+    ];
+    return allLoans;
   };
 
-  const currentData = versionData[currentClearingHouse];
-  const coolerAddress = currentData.coolerAddress.data;
-  const clearingHouse = clearingHouses[currentClearingHouse];
-  const loans = currentData.loans.data;
-  const isFetchedLoans = currentData.loans.isFetched;
+  const getActiveClearingHouse = () => {
+    if (clearingHouses.v3?.isActive && clearingHouses.v3?.capacity.gt(0)) {
+      return { version: "v3", ...clearingHouses.v3 };
+    }
+    if (clearingHouses.v2?.isActive && clearingHouses.v2?.capacity.gt(0)) {
+      return { version: "v2", ...clearingHouses.v2 };
+    }
+    return null;
+  };
 
-  const [extendLoan, setExtendLoan] = useState<any>(null);
-  const [repayLoan, setRepayLoan] = useState<any>(null);
-  const theme = useTheme();
+  const activeClearingHouse = getActiveClearingHouse();
+  const allLoans = getAllLoans();
 
-  // Update the clearing house version when the data is available
-  useEffect(() => {
-    if (clearingHouses.v3?.isActive && clearingHouses.v3?.capacity.gt(0)) {
-      setCurrentClearingHouse("v3");
-    } else if (clearingHouses.v2?.isActive && clearingHouses.v2?.capacity.gt(0)) {
-      setCurrentClearingHouse("v2");
+  const getClearingHouseForLoan = (version: string) => {
+    const clearingHouse = clearingHouses[version as keyof typeof clearingHouses];
+    if (!clearingHouse) throw new Error(`No clearing house found for version ${version}`);
+    return clearingHouse;
+  };
+
+  const getCoolerAddressForLoan = (version: string) => {
+    switch (version) {
+      case "v1":
+        return coolerAddressV1;
+      case "v2":
+        return coolerAddressV2;
+      case "v3":
+        return coolerAddressV3;
+      default:
+        return undefined;
     }
-  }, [clearingHouses.v2, clearingHouses.v3]);
+  };
+
+  console.log(allLoans, isFetchedLoansV1, isFetchedLoansV2, isFetchedLoansV3, address);
 
   return (
     <div id="cooler-positions">
       <Grid container spacing={2}>
         <Grid item xs={12} sm={4}>
-          <WeeklyCapacityRemaining capacity={clearingHouse?.capacity} reserveAsset={clearingHouse?.debtAssetName} />
+          <WeeklyCapacityRemaining
+            capacity={activeClearingHouse?.capacity}
+            reserveAsset={activeClearingHouse?.debtAssetName}
+          />
         </Grid>
         <Grid item xs={12} sm={4}>
           <BorrowRate />
@@ -129,46 +139,6 @@ export const CoolerPositions = () => {
           <OutstandingPrincipal />
         </Grid>
       </Grid>
-      {([(loansV1 || []).length > 0, (loansV2 || []).length > 0].filter(Boolean).length > 0 ||
-        (clearingHouses.v3?.isActive &&
-          clearingHouses.v3?.capacity.gt(0) &&
-          ((loansV1 && loansV1.length > 0) || (loansV2 && loansV2.length > 0)))) && (
-        <Box display="flex" mt="16px" justifyContent="right" gap="4px">
-          <Select
-            value={currentClearingHouse}
-            label="ClearingHouse"
-            onChange={e => {
-              setCurrentClearingHouse(e.target.value as "v1" | "v2" | "v3");
-            }}
-            sx={{
-              width: "200px",
-              height: "44px",
-              backgroundColor: theme.colors.gray[700],
-              border: "none",
-              ".MuiOutlinedInput-notchedOutline": {
-                border: "none",
-              },
-              "&.Mui-focused .MuiOutlinedInput-notchedOutline": {
-                border: "none",
-              },
-              "&:hover .MuiOutlinedInput-notchedOutline": {
-                border: "none",
-              },
-              "& .MuiSelect-select": {
-                display: "flex",
-                alignItems: "center",
-              },
-            }}
-          >
-            {loansV1 && loansV1.length > 0 && <MenuItem value="v1">ClearingHouse V1</MenuItem>}
-            {((loansV2 && loansV2.length > 0) ||
-              (clearingHouses.v2?.capacity.gt(0) && clearingHouses.v2?.isActive)) && (
-              <MenuItem value="v2">ClearingHouse V2</MenuItem>
-            )}
-            <MenuItem value="v3">ClearingHouse V3</MenuItem>
-          </Select>
-        </Box>
-      )}
 
       <Box mb="21px" mt="66px">
         <Typography variant="h1">Your Positions</Typography>
@@ -181,17 +151,11 @@ export const CoolerPositions = () => {
         </Box>
       )}
 
-      {address && !isFetchedLoans && (
-        <Box display="flex" justifyContent="center">
-          <Skeleton variant="rectangular" width="100%" height={100} />
-        </Box>
-      )}
-
-      {loans && loans.length == 0 && isFetchedLoans && (
+      {allLoans.length === 0 && isFetchedLoansV1 && isFetchedLoansV2 && isFetchedLoansV3 && address && (
         <Box display="flex" justifyContent="center">
           <Box textAlign="center">
             <Box fontWeight={700}>You currently have no Cooler loans</Box>
-            {clearingHouse?.isActive && clearingHouse.capacity.gt(0) && (
+            {activeClearingHouse && (
               <>
                 <Box pt="9px">Borrow against gOHM at a fixed rate and maturity</Box>
                 <Box mt="21px">
@@ -201,7 +165,7 @@ export const CoolerPositions = () => {
                       setCreateLoanModalOpen(true);
                     }}
                   >
-                    Borrow {clearingHouse?.debtAssetName} & Open Position
+                    Borrow {activeClearingHouse.debtAssetName} & Open Position
                   </PrimaryButton>
                 </Box>
               </>
@@ -210,132 +174,175 @@ export const CoolerPositions = () => {
         </Box>
       )}
 
-      {coolerAddress && (
+      {address && (!isFetchedLoansV1 || !isFetchedLoansV2 || !isFetchedLoansV3) && (
+        <Box display="flex" justifyContent="center">
+          <Typography variant="h4">Loading your positions...</Typography>
+        </Box>
+      )}
+
+      {allLoans.length > 0 && (
         <>
-          {loans && loans.length > 0 && (
-            <>
-              <TableContainer component={Paper}>
-                <Table sx={{ minWidth: 650 }} aria-label="simple table">
-                  <TableHead>
-                    <TableRow>
-                      <TableCell sx={{ fontSize: "15px", padding: "9px" }}>Collateral</TableCell>
-                      <TableCell sx={{ fontSize: "15px", padding: "9px" }} align="right">
-                        Interest Rate
+          <TableContainer component={Paper}>
+            <Table sx={{ minWidth: 650 }} aria-label="simple table">
+              <TableHead>
+                <TableRow>
+                  <TableCell sx={{ fontSize: "15px", padding: "9px" }}>Collateral</TableCell>
+                  <TableCell sx={{ fontSize: "15px", padding: "9px" }} align="right">
+                    Interest Rate
+                  </TableCell>
+                  <TableCell sx={{ fontSize: "15px", padding: "9px" }} align="right">
+                    Repayment
+                  </TableCell>
+                  <TableCell sx={{ fontSize: "15px", padding: "9px" }} align="right">
+                    Maturity Date
+                  </TableCell>
+                  <TableCell sx={{ fontSize: "15px", padding: "9px" }} align="right"></TableCell>
+                </TableRow>
+              </TableHead>
+              <TableBody>
+                {allLoans.map((loan, index) => {
+                  const principalAndInterest = loan.principal.add(loan.interestDue || 0) || 0;
+                  return (
+                    <TableRow key={index} sx={{ "&:last-child td, &:last-child th": { border: 0 } }}>
+                      <TableCell component="th" scope="row" sx={{ padding: "9px" }}>
+                        <Box display="flex" alignItems="center" gap="3px">
+                          {loan.collateral && Number(ethers.utils.formatUnits(loan.collateral.toString())).toFixed(4)}{" "}
+                          gOHM <Token name="gOHM" style={{ fontSize: "21px" }} />
+                        </Box>
                       </TableCell>
-                      <TableCell sx={{ fontSize: "15px", padding: "9px" }} align="right">
-                        Repayment
+                      <TableCell align="right" sx={{ padding: "9px" }}>
+                        {loan.request?.interest && (
+                          <Box>{Number(ethers.utils.formatUnits(loan.request.interest.toString())) * 100}%</Box>
+                        )}
                       </TableCell>
-                      <TableCell sx={{ fontSize: "15px", padding: "9px" }} align="right">
-                        Maturity Date
+                      <TableCell align="right" sx={{ padding: "9px" }}>
+                        {principalAndInterest && (
+                          <Box display="flex" justifyContent="end" alignItems={"center"} gap="3px">
+                            {Number(ethers.utils.formatUnits(principalAndInterest.toString())).toFixed(2)}{" "}
+                            {loan.debtAssetName}{" "}
+                            {loan.debtAssetName === "USDS" ? (
+                              <SvgIcon
+                                color="primary"
+                                sx={{ width: "20px", height: "20px" }}
+                                viewBox="0 0 50 50"
+                                component={usdsIcon}
+                              />
+                            ) : (
+                              <Token name={loan.debtAssetName as OHMTokenProps["name"]} style={{ fontSize: "21px" }} />
+                            )}
+                          </Box>
+                        )}
+                      </TableCell>
+                      <TableCell align="right" sx={{ padding: "9px" }}>
+                        {loan.expiry && (
+                          <Box>
+                            {new Date(Number(loan.expiry.toString()) * 1000).toLocaleString([], {
+                              month: "long",
+                              day: "numeric",
+                              year: "numeric",
+                            }) || ""}
+                          </Box>
+                        )}
+                      </TableCell>
+                      <TableCell align="right" sx={{ padding: "9px" }}>
+                        <Box display="flex">
+                          <SecondaryButton
+                            onClick={() => {
+                              setRepayLoan(loan);
+                              setCreateLoanModalOpen(true);
+                            }}
+                          >
+                            Repay
+                          </SecondaryButton>
+                          <PrimaryButton onClick={() => setExtendLoan(loan)}>Extend</PrimaryButton>
+                        </Box>
                       </TableCell>
-                      <TableCell sx={{ fontSize: "15px", padding: "9px" }} align="right"></TableCell>
                     </TableRow>
-                  </TableHead>
-                  <TableBody>
-                    {loans?.map((loan, index) => {
-                      const principalAndInterest = loan.principal.add(loan.interestDue || 0) || 0;
-                      return (
-                        <TableRow key={index} sx={{ "&:last-child td, &:last-child th": { border: 0 } }}>
-                          <TableCell component="th" scope="row" sx={{ padding: "9px" }}>
-                            <Box display="flex" alignItems="center" gap="3px">
-                              {loan.collateral &&
-                                Number(ethers.utils.formatUnits(loan.collateral.toString())).toFixed(4)}{" "}
-                              gOHM <Token name="gOHM" style={{ fontSize: "21px" }} />
-                            </Box>
-                          </TableCell>
-                          <TableCell align="right" sx={{ padding: "9px" }}>
-                            {loan.request?.interest && (
-                              <Box>{Number(ethers.utils.formatUnits(loan.request.interest.toString())) * 100}%</Box>
-                            )}
-                          </TableCell>
-                          <TableCell align="right" sx={{ padding: "9px" }}>
-                            {principalAndInterest && (
-                              <Box display="flex" justifyContent="end" alignItems={"center"} gap="3px">
-                                {Number(ethers.utils.formatUnits(principalAndInterest.toString())).toFixed(2)}{" "}
-                                {loan.debtAssetName}{" "}
-                                <Token
-                                  name={loan.debtAssetName as OHMTokenProps["name"]}
-                                  style={{ fontSize: "21px" }}
-                                />
-                              </Box>
-                            )}
-                          </TableCell>
-                          <TableCell align="right" sx={{ padding: "9px" }}>
-                            {loan.expiry && (
-                              <Box>
-                                {new Date(Number(loan.expiry.toString()) * 1000).toLocaleString([], {
-                                  month: "long",
-                                  day: "numeric",
-                                  year: "numeric",
-                                }) || ""}
-                              </Box>
-                            )}
-                          </TableCell>
-                          <TableCell align="right" sx={{ padding: "9px" }}>
-                            <Box display="flex">
-                              <SecondaryButton
-                                onClick={() => {
-                                  setRepayLoan(loan);
-                                  setCreateLoanModalOpen(true);
-                                }}
-                              >
-                                Repay
-                              </SecondaryButton>
-                              <PrimaryButton onClick={() => setExtendLoan(loan)}>Extend</PrimaryButton>
-                            </Box>
-                          </TableCell>
-                        </TableRow>
-                      );
-                    })}
-                  </TableBody>
-                </Table>
-              </TableContainer>
-              {clearingHouse?.isActive && clearingHouse.capacity.gt(0) && (
-                <Box display="flex" justifyContent={"center"} gap="4px">
-                  <PrimaryButton
-                    onClick={() => {
-                      setRepayLoan(undefined);
-                      setCreateLoanModalOpen(true);
-                    }}
-                  >
-                    Borrow {clearingHouse.debtAssetName} & Open Position
-                  </PrimaryButton>
-                </Box>
-              )}
-            </>
+                  );
+                })}
+              </TableBody>
+            </Table>
+          </TableContainer>
+          {activeClearingHouse && (
+            <Box display="flex" justifyContent={"center"} gap="4px">
+              <PrimaryButton
+                onClick={() => {
+                  setRepayLoan(undefined);
+                  setCreateLoanModalOpen(true);
+                }}
+              >
+                Borrow {activeClearingHouse.debtAssetName} & Open Position
+              </PrimaryButton>
+            </Box>
           )}
         </>
       )}
 
-      {clearingHouse && (
+      {activeClearingHouse && (
         <>
-          {extendLoan && (
+          {extendLoan && getClearingHouseForLoan(extendLoan.version) && getCoolerAddressForLoan(extendLoan.version) && (
             <ExtendLoan
               loan={extendLoan}
               setLoan={setExtendLoan}
-              loanToCollateral={clearingHouse.loanToCollateral}
-              interestRate={clearingHouse.interestRate}
-              duration={clearingHouse.duration}
-              coolerAddress={coolerAddress}
-              debtAddress={clearingHouse.debtAddress}
-              clearingHouseAddress={clearingHouse.clearingHouseAddress}
-              debtAssetName={clearingHouse.debtAssetName}
+              loanToCollateral={getClearingHouseForLoan(extendLoan.version).loanToCollateral}
+              interestRate={getClearingHouseForLoan(extendLoan.version).interestRate}
+              duration={getClearingHouseForLoan(extendLoan.version).duration}
+              coolerAddress={getCoolerAddressForLoan(extendLoan.version) || ""}
+              debtAddress={getClearingHouseForLoan(extendLoan.version).debtAddress}
+              clearingHouseAddress={getClearingHouseForLoan(extendLoan.version).clearingHouseAddress}
+              debtAssetName={getClearingHouseForLoan(extendLoan.version).debtAssetName}
             />
           )}
           <CreateOrRepayLoan
-            collateralAddress={clearingHouse.collateralAddress}
-            debtAddress={clearingHouse.debtAddress}
-            interestRate={clearingHouse.interestRate}
-            loanToCollateral={clearingHouse.loanToCollateral}
-            duration={clearingHouse.duration}
-            coolerAddress={coolerAddress}
-            factoryAddress={clearingHouse.factory}
-            capacity={ethers.utils.formatUnits(clearingHouse?.capacity || "0")}
+            collateralAddress={
+              repayLoan && getClearingHouseForLoan(repayLoan.version)
+                ? getClearingHouseForLoan(repayLoan.version).collateralAddress
+                : activeClearingHouse.collateralAddress
+            }
+            debtAddress={
+              repayLoan && getClearingHouseForLoan(repayLoan.version)
+                ? getClearingHouseForLoan(repayLoan.version).debtAddress
+                : activeClearingHouse.debtAddress
+            }
+            interestRate={
+              repayLoan && getClearingHouseForLoan(repayLoan.version)
+                ? getClearingHouseForLoan(repayLoan.version).interestRate
+                : activeClearingHouse.interestRate
+            }
+            loanToCollateral={
+              repayLoan && getClearingHouseForLoan(repayLoan.version)
+                ? getClearingHouseForLoan(repayLoan.version).loanToCollateral
+                : activeClearingHouse.loanToCollateral
+            }
+            duration={
+              repayLoan && getClearingHouseForLoan(repayLoan.version)
+                ? getClearingHouseForLoan(repayLoan.version).duration
+                : activeClearingHouse.duration
+            }
+            coolerAddress={
+              repayLoan && getCoolerAddressForLoan(repayLoan.version)
+                ? getCoolerAddressForLoan(repayLoan.version)
+                : coolerAddressV3 || ""
+            }
+            factoryAddress={
+              repayLoan && getClearingHouseForLoan(repayLoan.version)
+                ? getClearingHouseForLoan(repayLoan.version).factory
+                : activeClearingHouse.factory
+            }
+            capacity={ethers.utils.formatUnits(activeClearingHouse.capacity || "0")}
             setModalOpen={setCreateLoanModalOpen}
             modalOpen={createLoanModalOpen}
             loan={repayLoan}
-            clearingHouseAddress={clearingHouse.clearingHouseAddress}
-            debtAssetName={clearingHouse.debtAssetName}
+            clearingHouseAddress={
+              repayLoan && getClearingHouseForLoan(repayLoan.version)
+                ? getClearingHouseForLoan(repayLoan.version).clearingHouseAddress
+                : activeClearingHouse.clearingHouseAddress
+            }
+            debtAssetName={
+              repayLoan && getClearingHouseForLoan(repayLoan.version)
+                ? getClearingHouseForLoan(repayLoan.version).debtAssetName
+                : activeClearingHouse.debtAssetName
+            }
           />
         </>
       )}