diff --git a/src/ClaudeDev.ts b/src/ClaudeDev.ts
index c40dca8..3d60aff 100644
--- a/src/ClaudeDev.ts
+++ b/src/ClaudeDev.ts
@@ -541,6 +541,16 @@ export class ClaudeDev {
 			.slice()
 			.reverse()
 			.find((m) => !(m.ask === "resume_task" || m.ask === "resume_completed_task")) // could be multiple resume tasks
+		// const lastClaudeMessage = this.claudeMessages[lastClaudeMessageIndex]
+		// could be a completion result with a command
+		// const secondLastClaudeMessage = this.claudeMessages
+		// 	.slice()
+		// 	.reverse()
+		// 	.find(
+		// 		(m, index) =>
+		// 			index !== lastClaudeMessageIndex && !(m.ask === "resume_task" || m.ask === "resume_completed_task")
+		// 	)
+		// (lastClaudeMessage?.ask === "command" && secondLastClaudeMessage?.ask === "completion_result")
 
 		let askType: ClaudeAsk
 		if (lastClaudeMessage?.ask === "completion_result") {
diff --git a/src/utils/ripgrep.ts b/src/utils/ripgrep.ts
index 3f31234..6e62992 100644
--- a/src/utils/ripgrep.ts
+++ b/src/utils/ripgrep.ts
@@ -189,7 +189,7 @@ function formatResults(results: SearchResult[], cwd: string): string {
 	if (results.length >= MAX_RESULTS) {
 		output += `Showing first ${MAX_RESULTS} of ${MAX_RESULTS}+ results. Use a more specific search if necessary.\n\n`
 	} else {
-		output += `Found ${results.length.toLocaleString()} results.\n\n`
+		output += `Found ${results.length === 1 ? "1 result" : `${results.length.toLocaleString()} results`}.\n\n`
 	}
 
 	// Group results by file name
diff --git a/webview-ui/src/components/CodeBlock.tsx b/webview-ui/src/components/CodeBlock.tsx
index 2bae7b6..46c685a 100644
--- a/webview-ui/src/components/CodeBlock.tsx
+++ b/webview-ui/src/components/CodeBlock.tsx
@@ -27,9 +27,13 @@ const StyledMarkdown = styled.div`
 	pre > code {
 		.hljs-deletion {
 			background-color: var(--vscode-diffEditor-removedTextBackground);
+			display: inline-block;
+			width: 100%;
 		}
 		.hljs-addition {
 			background-color: var(--vscode-diffEditor-insertedTextBackground);
+			display: inline-block;
+			width: 100%;
 		}
 	}
 
diff --git a/webview-ui/src/components/TaskHeader.tsx b/webview-ui/src/components/TaskHeader.tsx
index 333fa7c..b2ff32c 100644
--- a/webview-ui/src/components/TaskHeader.tsx
+++ b/webview-ui/src/components/TaskHeader.tsx
@@ -177,7 +177,7 @@ const TaskHeader: React.FC<TaskHeaderProps> = ({
 							color: "var(--vscode-textLink-foreground)",
 							marginLeft: "auto",
 							textAlign: "right",
-							paddingRight: 0,
+							paddingRight: 2,
 						}}
 						onClick={() => setIsExpanded(!isExpanded)}>
 						See less