diff --git a/src/app/portfolio/[slug]/building-passport/[propertyId]/condition/page.tsx b/src/app/portfolio/[slug]/building-passport/[propertyId]/condition/page.tsx
index 72fdeb8c..081ed021 100644
--- a/src/app/portfolio/[slug]/building-passport/[propertyId]/condition/page.tsx
+++ b/src/app/portfolio/[slug]/building-passport/[propertyId]/condition/page.tsx
@@ -1,6 +1,7 @@
 import { getPropertyMeta } from "../utils";
 import { db } from "@/app/db/db";
 import ElementTable, { ElementGroup, Element } from "./components/ElementTable";
+import { Tabs, TabsList, TabsTrigger, TabsContent } from "@/app/shadcn_components/ui/tabs";
 
 type ConditionPageProps = {
   params: {
@@ -65,15 +66,28 @@ export default async function Condition({ params }: ConditionPageProps) {
 
   return (
     <div style={{ padding: "1rem" }}>
-      <h1>Property Condition</h1>
-      <p>
-        <strong>UPRN:</strong> {uprn} <br />
-        <strong>Survey Date:</strong> {survey.date} <br />
-        <strong>Source:</strong> {survey.source}
-      </p>
-
-      {/* Client-side interactive table */}
-      <ElementTable groupedElements={groupedElements} />
+      <Tabs defaultValue="surveys" className="w-full">
+        <TabsList>
+          <TabsTrigger value="surveys">
+            <div className="mr-4">Survey Data</div>
+          </TabsTrigger>
+          <TabsTrigger value="renewals">
+            <div className="mr-4">Renewals Timeline</div>
+          </TabsTrigger>
+          <TabsTrigger value="decent_homes">
+            <div className="mr-4">Decent Homes</div>
+          </TabsTrigger>
+        </TabsList>
+        <TabsContent value="surveys">
+          <ElementTable groupedElements={groupedElements} />
+        </TabsContent>
+        <TabsContent value="renewals">
+          <div>Coming soon...</div>
+        </TabsContent>
+        <TabsContent value="decent_homes">
+          <div>Coming soon...</div>
+        </TabsContent>
+      </Tabs>
     </div>
   );
 }