diff --git a/src/components/admin/builder/BuilderCanvas.tsx b/src/components/admin/builder/BuilderCanvas.tsx
index 7ae919d..5d39263 100644
--- a/src/components/admin/builder/BuilderCanvas.tsx
+++ b/src/components/admin/builder/BuilderCanvas.tsx
@@ -289,7 +289,7 @@ export function BuilderCanvas() {
                         </span>
                       </div>
 
-                      {screen.subtitle?.text && (
+                      {"subtitle" in screen && screen.subtitle?.text && (
                         <p className="mt-3 text-sm text-muted-foreground">{screen.subtitle.text}</p>
                       )}
 
diff --git a/src/components/admin/builder/BuilderSidebar.tsx b/src/components/admin/builder/BuilderSidebar.tsx
index 342138d..30a48a8 100644
--- a/src/components/admin/builder/BuilderSidebar.tsx
+++ b/src/components/admin/builder/BuilderSidebar.tsx
@@ -478,28 +478,30 @@ export function BuilderSidebar() {
                         </select>
                       </label>
 
-                      <div className="flex flex-col gap-2">
-                        <span className="text-sm font-medium text-muted-foreground">Варианты ответа</span>
-                        <div className="flex flex-col gap-2 rounded-lg border border-border/60 p-3">
-                          {selectedScreen.list.options.map((option) => {
-                            const condition = rule.conditions[0];
-                            const isChecked = condition.optionIds?.includes(option.id) ?? false;
-                            return (
-                              <label key={option.id} className="flex items-center gap-2 text-sm">
-                                <input
-                                  type="checkbox"
-                                  checked={isChecked}
-                                  onChange={() => handleRuleOptionToggle(selectedScreen.id, ruleIndex, option.id)}
-                                />
-                                <span>
-                                  {option.label}
-                                  <span className="text-muted-foreground"> ({option.id})</span>
-                                </span>
-                              </label>
-                            );
-                          })}
+                      {selectedScreen.template === "list" && (
+                        <div className="flex flex-col gap-2">
+                          <span className="text-sm font-medium text-muted-foreground">Варианты ответа</span>
+                          <div className="flex flex-col gap-2 rounded-lg border border-border/60 p-3">
+                            {selectedScreen.list.options.map((option) => {
+                              const condition = rule.conditions[0];
+                              const isChecked = condition.optionIds?.includes(option.id) ?? false;
+                              return (
+                                <label key={option.id} className="flex items-center gap-2 text-sm">
+                                  <input
+                                    type="checkbox"
+                                    checked={isChecked}
+                                    onChange={() => handleRuleOptionToggle(selectedScreen.id, ruleIndex, option.id)}
+                                  />
+                                  <span>
+                                    {option.label}
+                                    <span className="text-muted-foreground"> ({option.id})</span>
+                                  </span>
+                                </label>
+                              );
+                            })}
+                          </div>
                         </div>
-                      </div>
+                      )}
 
                       <label className="flex flex-col gap-2">
                         <span className="text-sm font-medium text-muted-foreground">Следующий экран</span>
diff --git a/src/components/admin/builder/templates/FormScreenConfig.tsx b/src/components/admin/builder/templates/FormScreenConfig.tsx
index 930cdfd..da7d195 100644
--- a/src/components/admin/builder/templates/FormScreenConfig.tsx
+++ b/src/components/admin/builder/templates/FormScreenConfig.tsx
@@ -65,8 +65,7 @@ export function FormScreenConfig({ screen, onUpdate }: FormScreenConfigProps) {
               </span>
               <Button
                 variant="ghost"
-                size="sm"
-                className="text-destructive"
+                className="h-8 px-3 text-xs text-destructive"
                 onClick={() => removeField(index)}
               >
                 Удалить
diff --git a/src/components/admin/builder/templates/InfoScreenConfig.tsx b/src/components/admin/builder/templates/InfoScreenConfig.tsx
index f6c55e1..077dd34 100644
--- a/src/components/admin/builder/templates/InfoScreenConfig.tsx
+++ b/src/components/admin/builder/templates/InfoScreenConfig.tsx
@@ -76,7 +76,9 @@ export function InfoScreenConfig({ screen, onUpdate }: InfoScreenConfigProps) {
             <select
               className="rounded-lg border border-border bg-background px-2 py-1"
               value={infoScreen.icon?.size ?? "lg"}
-              onChange={(event) => handleIconChange("size", event.target.value)}
+              onChange={(event) =>
+                handleIconChange("size", event.target.value as "sm" | "md" | "lg" | "xl")
+              }
             >
               <option value="sm">Маленький</option>
               <option value="md">Средний</option>