diff --git a/lib/zin/wg/textarea/v1.php b/lib/zin/wg/textarea/v1.php
index a85597dbc4..62699e8a55 100644
--- a/lib/zin/wg/textarea/v1.php
+++ b/lib/zin/wg/textarea/v1.php
@@ -35,7 +35,7 @@ class textarea extends wg
     {
         return h::textarea
         (
-            set($this->props->pick(array('name', 'id', 'class', 'required', 'placeholder', 'rows', 'cols'))),
+            set($this->props->pick(array('name', 'id', 'class', 'required', 'placeholder', 'rows', 'cols', 'disabled'))),
             $this->prop('value'),
             $this->children()
         );
diff --git a/module/testtask/css/runcase.css b/module/testtask/css/runcase.css
index ac63bac52d..d2fb82b85b 100644
--- a/module/testtask/css/runcase.css
+++ b/module/testtask/css/runcase.css
@@ -33,4 +33,3 @@
 .form-condensed textarea[id*='reals'] {height: 35px;}
 
 .result-item .span-warning{color: #f1a325;}
-
diff --git a/module/testtask/css/runcase.ui.css b/module/testtask/css/runcase.ui.css
new file mode 100644
index 0000000000..a6c338147b
--- /dev/null
+++ b/module/testtask/css/runcase.ui.css
@@ -0,0 +1,9 @@
+.case-precondition {color: var(--color-slate-700);}
+#caseStepForm tr {border-width: 0px;}
+#caseStepForm thead {background-color: unset;}
+#caseStepForm thead > tr > * {padding-left: 0px; font-size: 14px; color: var(--color-slate-900); font-weight: 600;}
+#caseStepForm tbody > tr > td:not(.p-0) {padding: 0.5rem; vertical-align: top; line-height: 1.5rem;}
+#caseStepForm tbody > tr > td.real-td, #caseStepForm tbody > tr > td.result-td {padding: 0.25rem 0.5rem; vertical-align: middle;}
+#caseStepForm tbody > tr > td.real-td {padding-left: 0px;}
+#caseStepForm .step-item-id {color: var(--color-slate-500);}
+
diff --git a/module/testtask/ui/runcase.html.php b/module/testtask/ui/runcase.html.php
index 0ff654d288..d1c331682f 100644
--- a/module/testtask/ui/runcase.html.php
+++ b/module/testtask/ui/runcase.html.php
@@ -47,27 +47,47 @@ if($confirm != 'yes')
             $childID = 0;
         }
 
-        $itemTds = array();
-        if($step->type != 'group')
-        {
-            $itemTds[] = h::td
+        $stepItemID = $childID != 0 ? "{$stepID}.{$childID}" : $stepID;
+        $stepTrs[] = h::tr
+        (
+            setClass("step {$stepClass}"),
+            h::td
             (
-                setClass('text-left'),
+                setClass('text-left border'),
+                div
+                (
+                    setClass('inputGroup'),
+                    h::span
+                    (
+                        setClass('step-item-id mr-2'),
+                        $childID != 0 ? setClass('ml-2') : '',
+                        $stepItemID,
+                    ),
+                    nl2br(zget($step, 'desc', '')),
+                ),
+            ),
+            h::td
+            (
+                setClass('text-left border'),
                 nl2br(zget($step, 'expect', '')),
-            );
-            $itemTds[] = h::td
+            ),
+            h::td
             (
-                setClass("text-center"),
+                setClass('result-td'),
+                setClass('text-center'),
                 picker
                 (
                     on::change('checkStepValue'),
                     set::name("steps[{$step->id}]"),
                     set::items($lang->testcase->resultList),
-                    set::value('pass'),
+                    set::value($step->type != 'group' ? 'pass' : ''),
+                    set::required($step->type != 'group'),
+                    set::disabled($step->type == 'group'),
                 ),
-            );
-            $itemTds[] = h::td
+            ),
+            h::td
             (
+                setClass('real-td'),
                 h::table
                 (
                     setClass('w-full'),
@@ -76,60 +96,36 @@ if($confirm != 'yes')
                         h::td
                         (
                             setClass('p-0 bd-0'),
-                            h::textarea
+                            textarea
                             (
                                 on::keyup('realChange'),
-                                setClass('leading-4 w-full'),
+                                setClass('leading-4 w-full' ),
                                 set('rows', '1'),
                                 set::name("reals[{$step->id}]"),
                                 nl2br(zget($step, 'real', '')),
+                                $step->type == 'group' ? set('disabled', 'disabled') : '',
                             )
                         ),
                         h::td
                         (
                             setClass('p-0 bd-0 text-right'),
-                            width('50px'),
+                            width('40px'),
                             btn
                             (
-                                setClass('ml-4'),
-                                set::url("#fileModal{$step->id}"),
-                                set('data-toggle', 'modal'),
+                                setClass('ml-2 text-primary'),
+                                $step->type != 'group' ? set::url("#fileModal{$step->id}") : '',
+                                $step->type != 'group' ? set('data-toggle', 'modal') : '',
                                 set('title', $lang->testtask->files),
                                 set::icon('paper-clip'),
+                                set::disabled($step->type == 'group'),
                             ),
                         ),
                     ),
                 ),
-            );
-        }
-
-        $stepTrs[] = h::tr
-        (
-            setClass("step {$stepClass}"),
-            h::th
-            (
-                setClass('step-id'),
-                $stepID,
             ),
-            h::td
-            (
-                setClass('text-left'),
-                $step->type == 'group' ? set('colspan', '4') : '',
-                div
-                (
-                    setClass('inputGroup'),
-                    $step->type == 'item' ? h::span
-                    (
-                        setClass('step-item-id mr-2'),
-                        "{$stepID}.{$childID}",
-                    ) : '',
-                    nl2br(zget($step, 'desc', '')),
-                ),
-            ),
-            $itemTds,
         );
 
-        $childId ++;
+        $childID ++;
 
         $fileModals[] = modal
         (
@@ -153,32 +149,40 @@ if($confirm != 'yes')
     }
 }
 
+!empty($run->case->precondition) ? h::table
+(
+    setClass('mb-6'),
+    h::tr
+    (
+        h::td
+        (
+            setClass('case-precondition w-16 align-top'),
+            $lang->testcase->precondition,
+        ),
+        h::td
+        (
+            nl2br(zget($run->case, 'precondition', '')),
+            nl2br(zget($run->case, 'precondition', '')),
+            nl2br(zget($run->case, 'precondition', '')),
+            nl2br(zget($run->case, 'precondition', '')),
+            nl2br(zget($run->case, 'precondition', '')),
+            nl2br(zget($run->case, 'precondition', '')),
+        ),
+    ),
+) : '';
+
 
 form
 (
+    set::id('caseStepForm'),
     set::actions(array()),
     h::table
     (
-        setClass('table bordered'),
+        setClass('table'),
         h::thead
         (
-            h::tr
-            (
-                h::td
-                (
-                    set('colspan', '5'),
-                    h::strong($lang->testcase->precondition),
-                    h::br(),
-                    nl2br(zget($run->case, 'precondition', '')),
-                ),
-            ),
             $confirm != 'yes' ? h::tr
             (
-                h::td
-                (
-                    width('50px'),
-                    $lang->testcase->stepID,
-                ),
                 h::td
                 (
                     width('cal(30%)'),
@@ -207,11 +211,11 @@ form
             (
                 h::td
                 (
-                    set('colspan', '5'),
+                    set('colspan', '4'),
                     div
                     (
                         setClass('text-center'),
-                        $preCase ? h::a
+                        $preCase ? a
                         (
                             setClass('btn btn-wide w-24'),
                             set::id('pre'),
@@ -224,7 +228,7 @@ form
                             set::btnType('submit'),
                             $lang->save,
                         ) : '',
-                        $nextCase ? h::a
+                        $nextCase ? a
                         (
                             setClass('btn btn-wide w-24'),
                             set::id('next'),