diff --git a/apps/app/src/components/views/board-view/dialogs/add-feature-dialog.tsx b/apps/app/src/components/views/board-view/dialogs/add-feature-dialog.tsx
index b1bc6f7f..fe7f2795 100644
--- a/apps/app/src/components/views/board-view/dialogs/add-feature-dialog.tsx
+++ b/apps/app/src/components/views/board-view/dialogs/add-feature-dialog.tsx
@@ -165,7 +165,8 @@ export function AddFeatureDialog({
       );
 
       if (result?.success && result.enhancedText) {
-        setNewFeature(prev => ({ ...prev, description: result.enhancedText! }));
+        const enhancedText = result.enhancedText;
+        setNewFeature(prev => ({ ...prev, description: enhancedText }));
         toast.success("Description enhanced!");
       } else {
         toast.error(result?.error || "Failed to enhance description");
@@ -242,7 +243,7 @@ export function AddFeatureDialog({
           </TabsList>
 
           {/* Prompt Tab */}
-          <TabsContent value="prompt" className="space-y-4 overflow-y-auto">
+          <TabsContent value="prompt" className="space-y-4 overflow-y-auto cursor-default">
             <div className="space-y-2">
               <Label htmlFor="description">Description</Label>
               <DescriptionImageDropZone
@@ -263,45 +264,45 @@ export function AddFeatureDialog({
                 autoFocus
                 error={descriptionError}
               />
-              <div className="flex items-center gap-3 mt-2">
-                <DropdownMenu>
-                  <DropdownMenuTrigger asChild>
-                    <Button variant="outline" size="sm" className="w-[180px] justify-between">
-                      {enhancementMode === 'improve' && 'Improve Clarity'}
-                      {enhancementMode === 'technical' && 'Add Technical Details'}
-                      {enhancementMode === 'simplify' && 'Simplify'}
-                      {enhancementMode === 'acceptance' && 'Add Acceptance Criteria'}
-                      <ChevronDown className="w-4 h-4 ml-2" />
-                    </Button>
-                  </DropdownMenuTrigger>
-                  <DropdownMenuContent align="start">
-                    <DropdownMenuItem onClick={() => setEnhancementMode('improve')}>
-                      Improve Clarity
-                    </DropdownMenuItem>
-                    <DropdownMenuItem onClick={() => setEnhancementMode('technical')}>
-                      Add Technical Details
-                    </DropdownMenuItem>
-                    <DropdownMenuItem onClick={() => setEnhancementMode('simplify')}>
-                      Simplify
-                    </DropdownMenuItem>
-                    <DropdownMenuItem onClick={() => setEnhancementMode('acceptance')}>
-                      Add Acceptance Criteria
-                    </DropdownMenuItem>
-                  </DropdownMenuContent>
-                </DropdownMenu>
+            </div>
+            <div className="flex w-fit items-center gap-3 select-none cursor-default">
+              <DropdownMenu>
+                <DropdownMenuTrigger asChild>
+                  <Button variant="outline" size="sm" className="w-[180px] justify-between">
+                    {enhancementMode === 'improve' && 'Improve Clarity'}
+                    {enhancementMode === 'technical' && 'Add Technical Details'}
+                    {enhancementMode === 'simplify' && 'Simplify'}
+                    {enhancementMode === 'acceptance' && 'Add Acceptance Criteria'}
+                    <ChevronDown className="w-4 h-4 ml-2" />
+                  </Button>
+                </DropdownMenuTrigger>
+                <DropdownMenuContent align="start">
+                  <DropdownMenuItem onClick={() => setEnhancementMode('improve')}>
+                    Improve Clarity
+                  </DropdownMenuItem>
+                  <DropdownMenuItem onClick={() => setEnhancementMode('technical')}>
+                    Add Technical Details
+                  </DropdownMenuItem>
+                  <DropdownMenuItem onClick={() => setEnhancementMode('simplify')}>
+                    Simplify
+                  </DropdownMenuItem>
+                  <DropdownMenuItem onClick={() => setEnhancementMode('acceptance')}>
+                    Add Acceptance Criteria
+                  </DropdownMenuItem>
+                </DropdownMenuContent>
+              </DropdownMenu>
 
-                <Button
-                  type="button"
-                  variant="outline"
-                  size="sm"
-                  onClick={handleEnhanceDescription}
-                  disabled={!newFeature.description.trim() || isEnhancing}
-                  loading={isEnhancing}
-                >
-                  <Sparkles className="w-4 h-4 mr-2" />
-                  Enhance with AI
-                </Button>
-              </div>
+              <Button
+                type="button"
+                variant="outline"
+                size="sm"
+                onClick={handleEnhanceDescription}
+                disabled={!newFeature.description.trim() || isEnhancing}
+                loading={isEnhancing}
+              >
+                <Sparkles className="w-4 h-4 mr-2" />
+                Enhance with AI
+              </Button>
             </div>
             <div className="space-y-2">
               <Label htmlFor="category">Category (optional)</Label>
@@ -318,7 +319,7 @@ export function AddFeatureDialog({
           </TabsContent>
 
           {/* Model Tab */}
-          <TabsContent value="model" className="space-y-4 overflow-y-auto">
+          <TabsContent value="model" className="space-y-4 overflow-y-auto cursor-default">
             {/* Show Advanced Options Toggle */}
             {showProfilesOnly && (
               <div className="flex items-center justify-between p-3 bg-muted/30 rounded-lg border border-border">
@@ -381,7 +382,7 @@ export function AddFeatureDialog({
           </TabsContent>
 
           {/* Testing Tab */}
-          <TabsContent value="testing" className="space-y-4 overflow-y-auto">
+          <TabsContent value="testing" className="space-y-4 overflow-y-auto cursor-default">
             <TestingTabContent
               skipTests={newFeature.skipTests}
               onSkipTestsChange={(skipTests) =>
diff --git a/apps/app/src/components/views/board-view/dialogs/edit-feature-dialog.tsx b/apps/app/src/components/views/board-view/dialogs/edit-feature-dialog.tsx
index 8c3e032d..52603b49 100644
--- a/apps/app/src/components/views/board-view/dialogs/edit-feature-dialog.tsx
+++ b/apps/app/src/components/views/board-view/dialogs/edit-feature-dialog.tsx
@@ -154,7 +154,8 @@ export function EditFeatureDialog({
       );
 
       if (result?.success && result.enhancedText) {
-        setEditingFeature(prev => prev ? { ...prev, description: result.enhancedText! } : prev);
+        const enhancedText = result.enhancedText;
+        setEditingFeature(prev => prev ? { ...prev, description: enhancedText } : prev);
         toast.success("Description enhanced!");
       } else {
         toast.error(result?.error || "Failed to enhance description");
@@ -215,7 +216,7 @@ export function EditFeatureDialog({
           </TabsList>
 
           {/* Prompt Tab */}
-          <TabsContent value="prompt" className="space-y-4 overflow-y-auto">
+          <TabsContent value="prompt" className="space-y-4 overflow-y-auto cursor-default">
             <div className="space-y-2">
               <Label htmlFor="edit-description">Description</Label>
               <DescriptionImageDropZone
@@ -238,45 +239,45 @@ export function EditFeatureDialog({
                 onPreviewMapChange={setEditFeaturePreviewMap}
                 data-testid="edit-feature-description"
               />
-              <div className="flex items-center gap-3 mt-2">
-                <DropdownMenu>
-                  <DropdownMenuTrigger asChild>
-                    <Button variant="outline" size="sm" className="w-[180px] justify-between">
-                      {enhancementMode === 'improve' && 'Improve Clarity'}
-                      {enhancementMode === 'technical' && 'Add Technical Details'}
-                      {enhancementMode === 'simplify' && 'Simplify'}
-                      {enhancementMode === 'acceptance' && 'Add Acceptance Criteria'}
-                      <ChevronDown className="w-4 h-4 ml-2" />
-                    </Button>
-                  </DropdownMenuTrigger>
-                  <DropdownMenuContent align="start">
-                    <DropdownMenuItem onClick={() => setEnhancementMode('improve')}>
-                      Improve Clarity
-                    </DropdownMenuItem>
-                    <DropdownMenuItem onClick={() => setEnhancementMode('technical')}>
-                      Add Technical Details
-                    </DropdownMenuItem>
-                    <DropdownMenuItem onClick={() => setEnhancementMode('simplify')}>
-                      Simplify
-                    </DropdownMenuItem>
-                    <DropdownMenuItem onClick={() => setEnhancementMode('acceptance')}>
-                      Add Acceptance Criteria
-                    </DropdownMenuItem>
-                  </DropdownMenuContent>
-                </DropdownMenu>
+            </div>
+            <div className="flex w-fit items-center gap-3 select-none cursor-default">
+              <DropdownMenu>
+                <DropdownMenuTrigger asChild>
+                  <Button variant="outline" size="sm" className="w-[180px] justify-between">
+                    {enhancementMode === 'improve' && 'Improve Clarity'}
+                    {enhancementMode === 'technical' && 'Add Technical Details'}
+                    {enhancementMode === 'simplify' && 'Simplify'}
+                    {enhancementMode === 'acceptance' && 'Add Acceptance Criteria'}
+                    <ChevronDown className="w-4 h-4 ml-2" />
+                  </Button>
+                </DropdownMenuTrigger>
+                <DropdownMenuContent align="start">
+                  <DropdownMenuItem onClick={() => setEnhancementMode('improve')}>
+                    Improve Clarity
+                  </DropdownMenuItem>
+                  <DropdownMenuItem onClick={() => setEnhancementMode('technical')}>
+                    Add Technical Details
+                  </DropdownMenuItem>
+                  <DropdownMenuItem onClick={() => setEnhancementMode('simplify')}>
+                    Simplify
+                  </DropdownMenuItem>
+                  <DropdownMenuItem onClick={() => setEnhancementMode('acceptance')}>
+                    Add Acceptance Criteria
+                  </DropdownMenuItem>
+                </DropdownMenuContent>
+              </DropdownMenu>
 
-                <Button
-                  type="button"
-                  variant="outline"
-                  size="sm"
-                  onClick={handleEnhanceDescription}
-                  disabled={!editingFeature.description.trim() || isEnhancing}
-                  loading={isEnhancing}
-                >
-                  {!isEnhancing && <Sparkles className="w-4 h-4 mr-2" />}
-                  Enhance with AI
-                </Button>
-              </div>
+              <Button
+                type="button"
+                variant="outline"
+                size="sm"
+                onClick={handleEnhanceDescription}
+                disabled={!editingFeature.description.trim() || isEnhancing}
+                loading={isEnhancing}
+              >
+                <Sparkles className="w-4 h-4 mr-2" />
+                Enhance with AI
+              </Button>
             </div>
             <div className="space-y-2">
               <Label htmlFor="edit-category">Category (optional)</Label>
@@ -296,7 +297,7 @@ export function EditFeatureDialog({
           </TabsContent>
 
           {/* Model Tab */}
-          <TabsContent value="model" className="space-y-4 overflow-y-auto">
+          <TabsContent value="model" className="space-y-4 overflow-y-auto cursor-default">
             {/* Show Advanced Options Toggle */}
             {showProfilesOnly && (
               <div className="flex items-center justify-between p-3 bg-muted/30 rounded-lg border border-border">
@@ -362,7 +363,7 @@ export function EditFeatureDialog({
           </TabsContent>
 
           {/* Testing Tab */}
-          <TabsContent value="testing" className="space-y-4 overflow-y-auto">
+          <TabsContent value="testing" className="space-y-4 overflow-y-auto cursor-default">
             <TestingTabContent
               skipTests={editingFeature.skipTests ?? false}
               onSkipTestsChange={(skipTests) =>
diff --git a/apps/app/src/components/views/settings-view/ai-enhancement/ai-enhancement-section.tsx b/apps/app/src/components/views/settings-view/ai-enhancement/ai-enhancement-section.tsx
index 1e054148..66466d34 100644
--- a/apps/app/src/components/views/settings-view/ai-enhancement/ai-enhancement-section.tsx
+++ b/apps/app/src/components/views/settings-view/ai-enhancement/ai-enhancement-section.tsx
@@ -1,7 +1,7 @@
 import { Label } from "@/components/ui/label";
 import { Sparkles } from "lucide-react";
 import { cn } from "@/lib/utils";
-import { useAppStore, type AgentModel } from "@/store/app-store";
+import { useAppStore } from "@/store/app-store";
 import { CLAUDE_MODELS } from "@/components/views/board-view/shared/model-constants";
 
 export function AIEnhancementSection() {
@@ -38,7 +38,7 @@ export function AIEnhancementSection() {
               return (
                 <button
                   key={id}
-                  onClick={() => setEnhancementModel(id as AgentModel)}
+                  onClick={() => setEnhancementModel(id)}
                   className={cn(
                     "group flex flex-col items-start gap-2 px-4 py-4 rounded-xl text-left",
                     "transition-all duration-200 ease-out",
diff --git a/apps/server/src/routes/enhance-prompt/routes/enhance.ts b/apps/server/src/routes/enhance-prompt/routes/enhance.ts
index c43ec362..75587a94 100644
--- a/apps/server/src/routes/enhance-prompt/routes/enhance.ts
+++ b/apps/server/src/routes/enhance-prompt/routes/enhance.ts
@@ -14,7 +14,7 @@ import {
   isValidEnhancementMode,
   type EnhancementMode,
 } from "../../../lib/enhancement-prompts.js";
-import { resolveModelString } from "../../../lib/model-resolver.js";
+import { resolveModelString, CLAUDE_MODEL_MAP } from "../../../lib/model-resolver.js";
 
 const logger = createLogger("EnhancePrompt");
 
@@ -68,7 +68,7 @@ async function extractTextFromStream(
     if (msg.type === "assistant" && msg.message?.content) {
       for (const block of msg.message.content) {
         if (block.type === "text" && block.text) {
-          responseText = block.text;
+          responseText += block.text;
         }
       }
     } else if (msg.type === "result" && msg.subtype === "success") {
@@ -141,7 +141,7 @@ export function createEnhanceHandler(): (
       const userPrompt = buildUserPrompt(validMode, trimmedText, true);
 
       // Resolve the model - use the passed model, default to sonnet for quality
-      const resolvedModel = resolveModelString(model, "claude-sonnet-4-20250514");
+      const resolvedModel = resolveModelString(model, CLAUDE_MODEL_MAP.sonnet);
 
       logger.debug(`Using model: ${resolvedModel}`);