diff --git a/src/app/portfolio/[slug]/(portfolio)/settings/layout.tsx b/src/app/portfolio/[slug]/(portfolio)/settings/layout.tsx
index 1f6cdae..db1a38b 100644
--- a/src/app/portfolio/[slug]/(portfolio)/settings/layout.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/settings/layout.tsx
@@ -15,7 +15,7 @@ export default async function SettingsLayout({
   const isDomnaUser = !!session?.user?.email?.endsWith("@domna.homes");
 
   return (
-    <div className="flex max-w-8xl mx-auto mt-6 px-4 gap-8">
+    <div className="flex max-w-8xl mx-auto mt-6 px-4 gap-8 mb-8">
       <aside className="w-56 shrink-0">
         <p className="px-3 mb-1 text-xs font-semibold text-gray-400 uppercase tracking-widest">
           Settings
diff --git a/src/app/portfolio/[slug]/(portfolio)/settings/logs/PortfolioLogs.tsx b/src/app/portfolio/[slug]/(portfolio)/settings/logs/PortfolioLogs.tsx
index 4596d5e..62596c3 100644
--- a/src/app/portfolio/[slug]/(portfolio)/settings/logs/PortfolioLogs.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/settings/logs/PortfolioLogs.tsx
@@ -86,7 +86,7 @@ export default function PortfolioLogs({ portfolioId }: { portfolioId: string })
   const selectedTask = tasks.find((t) => t.id === selectedTaskId);
 
   return (
-    <div className="flex min-h-[600px] border border-gray-200 rounded-lg overflow-hidden bg-gray-50">
+    <div className="flex min-h-[600px] max-h-[calc(100vh-220px)] border border-gray-200 rounded-lg overflow-hidden bg-gray-50">
       {/* Left sidebar - Task list */}
       <div className="w-80 border-r border-gray-200 bg-white shrink-0">
         <PortfolioTaskList
diff --git a/src/app/portfolio/[slug]/(portfolio)/settings/logs/PortfolioSubtaskDetails.tsx b/src/app/portfolio/[slug]/(portfolio)/settings/logs/PortfolioSubtaskDetails.tsx
index 247713b..7b9a334 100644
--- a/src/app/portfolio/[slug]/(portfolio)/settings/logs/PortfolioSubtaskDetails.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/settings/logs/PortfolioSubtaskDetails.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useState } from "react";
+import { useState, useEffect } from "react";
 import { SubTask, PortfolioTask } from "./PortfolioLogs";
 import { ScrollArea } from "@/app/shadcn_components/ui/scroll-area";
 import { Card } from "@/app/shadcn_components/ui/card";
@@ -187,6 +187,10 @@ export default function PortfolioSubtaskDetails({
 }: PortfolioSubtaskDetailsProps) {
   const [expandedSubtasks, setExpandedSubtasks] = useState<Record<string, boolean>>({});
 
+  useEffect(() => {
+    setExpandedSubtasks({});
+  }, [task?.id]);
+
   const toggleSubtask = (subtaskId: string) => {
     setExpandedSubtasks((prev) => ({ ...prev, [subtaskId]: !prev[subtaskId] }));
   };
@@ -273,7 +277,7 @@ export default function PortfolioSubtaskDetails({
       )}
 
       {/* Subtasks List */}
-      <ScrollArea className="flex-1 p-6">
+      <ScrollArea key={task?.id} className="flex-1 p-6">
         <div className="space-y-4">
           <h3 className="text-base font-semibold text-gray-900">
             Subtasks ({subtasks.length})