diff --git a/frontend/src/components/UnifiedPromptModal.jsx b/frontend/src/components/UnifiedPromptModal.jsx
index 2157eb2..24badf7 100644
--- a/frontend/src/components/UnifiedPromptModal.jsx
+++ b/frontend/src/components/UnifiedPromptModal.jsx
@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react'
+import { useState, useEffect, useRef } from 'react'
 import { api } from '../utils/api'
 import { X, Plus, Trash2, MoveUp, MoveDown, Code } from 'lucide-react'
 import PlaceholderPicker from './PlaceholderPicker'
@@ -39,6 +39,8 @@ export default function UnifiedPromptModal({ prompt, onSave, onClose }) {
   const [error, setError] = useState(null)
   const [showPlaceholderPicker, setShowPlaceholderPicker] = useState(false)
   const [pickerTarget, setPickerTarget] = useState(null) // 'base' or {stage, promptIdx}
+  const [cursorPosition, setCursorPosition] = useState(null) // Track cursor position for insertion
+  const baseTemplateRef = useRef(null)
 
   // Test functionality
   const [testing, setTesting] = useState(false)
@@ -514,9 +516,12 @@ export default function UnifiedPromptModal({ prompt, onSave, onClose }) {
           <div style={{ marginBottom: 24 }}>
             <h3 style={{ fontSize: 16, fontWeight: 600, marginBottom: 12 }}>Template</h3>
             <textarea
+              ref={baseTemplateRef}
               className="form-input"
               value={template}
               onChange={e => setTemplate(e.target.value)}
+              onClick={e => setCursorPosition(e.target.selectionStart)}
+              onKeyUp={e => setCursorPosition(e.target.selectionStart)}
               rows={12}
               placeholder="Prompt-Template mit {{placeholders}}..."
               style={{ width: '100%', textAlign: 'left', resize: 'vertical', fontFamily: 'monospace', fontSize: 12 }}
@@ -799,10 +804,22 @@ export default function UnifiedPromptModal({ prompt, onSave, onClose }) {
         <PlaceholderPicker
           onSelect={(placeholder) => {
             if (pickerTarget === 'base') {
-              // Insert into base template
-              setTemplate(template + placeholder)
+              // Insert into base template at cursor position
+              const pos = cursorPosition ?? template.length
+              const newTemplate = template.slice(0, pos) + placeholder + template.slice(pos)
+              setTemplate(newTemplate)
+
+              // Restore focus and cursor position after insertion
+              setTimeout(() => {
+                if (baseTemplateRef.current) {
+                  baseTemplateRef.current.focus()
+                  const newPos = pos + placeholder.length
+                  baseTemplateRef.current.setSelectionRange(newPos, newPos)
+                  setCursorPosition(newPos)
+                }
+              }, 0)
             } else if (pickerTarget && typeof pickerTarget === 'object') {
-              // Insert into pipeline stage template
+              // Insert into pipeline stage template (append at end for now)
               const { stage: stageNum, promptIdx } = pickerTarget
               setStages(stages.map(s => {
                 if (s.stage === stageNum) {
diff --git a/frontend/src/pages/Analysis.jsx b/frontend/src/pages/Analysis.jsx
index af3a630..6b9b2f6 100644
--- a/frontend/src/pages/Analysis.jsx
+++ b/frontend/src/pages/Analysis.jsx
@@ -103,12 +103,13 @@ export default function Analysis() {
 
   const deleteInsight = async (id) => {
     if (!confirm('Analyse löschen?')) return
-    const pid = localStorage.getItem('bodytrack_active_profile')||''
-    await fetch(`/api/insights/${id}`, {
-      method:'DELETE', headers: pid ? {'X-Profile-Id':pid} : {}
-    })
-    if (newResult?.id === id) setNewResult(null)
-    await loadAll()
+    try {
+      await api.deleteInsight(id)
+      if (newResult?.id === id) setNewResult(null)
+      await loadAll()
+    } catch (e) {
+      setError('Löschen fehlgeschlagen: ' + e.message)
+    }
   }
 
   // Group insights by scope for history view
diff --git a/frontend/src/utils/api.js b/frontend/src/utils/api.js
index 2e144d0..4ecf851 100644
--- a/frontend/src/utils/api.js
+++ b/frontend/src/utils/api.js
@@ -107,6 +107,7 @@ export const api = {
   insightPipeline: ()    => req('/insights/pipeline',{method:'POST'}),
   listInsights:    ()    => req('/insights'),
   latestInsights:  ()    => req('/insights/latest'),
+  deleteInsight:   (id)  => req(`/insights/${id}`, {method:'DELETE'}),
   exportZip: async () => {
     const res = await fetch(`${BASE}/export/zip`, {headers: hdrs()})
     if (!res.ok) throw new Error('Export failed')