diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp
index 0f16fad..5cb27c1 100644
--- a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp
+++ b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp
@@ -26,7 +26,7 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
     qDebug() << "AMMtasksWidget init thread ID " << QThread::currentThreadId();
 
     treeWidget = new QTreeWidget();
-    ui->horizontalLayout_1->addWidget(treeWidget);
+    ui->horizontalLayout_Tree->addWidget(treeWidget);
 
     connect(treeWidget, &QTreeWidget::currentItemChanged, this, &AMMtasksWidget::on_treeWidget_currentItemChanged);
 
@@ -62,7 +62,7 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
         //ui->horizontalLayout_3->addWidget(ui->btnOnlyActive);
         //ui->horizontalLayout_3->addWidget(ui->btnCheck);
         //ui->horizontalLayout_3->addWidget(ui->btnDelete);
-        ui->horizontalLayout_3->setAlignment(Qt::AlignmentFlag::AlignLeft);
+        //ui->horizontalLayout_3->setAlignment(Qt::AlignmentFlag::AlignLeft);
 
         ui->btnDelete->setVisible(false);
         ui->btnCheck->setVisible(false);
@@ -73,7 +73,7 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
         ui->btnAssignTask->setVisible(false);
 
         //ui->verticalLayout->setAlignment(Qt::AlignmentFlag::AlignBottom);
-        ui->horizontalLayout_3->setAlignment(Qt::AlignmentFlag::AlignLeft);
+        //ui->horizontalLayout_3->setAlignment(Qt::AlignmentFlag::AlignLeft);
     }
 
     //ui->btnCheck->setVisible(false);
diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.ui b/InstructorsAndTrainees/tasks/ammtaskswidget.ui
index 1a93ab3..3f4ca46 100644
--- a/InstructorsAndTrainees/tasks/ammtaskswidget.ui
+++ b/InstructorsAndTrainees/tasks/ammtaskswidget.ui
@@ -31,71 +31,22 @@
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout">
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_1"/>
+        <layout class="QHBoxLayout" name="horizontalLayout_Tree"/>
        </item>
        <item>
-        <layout class="QVBoxLayout" name="verticalLayout"/>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <layout class="QVBoxLayout" name="verticalLayout_Btn">
          <item>
-          <widget class="QToolButton" name="btnAssignTask">
-           <property name="minimumSize">
+          <spacer name="verticalSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
             <size>
-             <width>50</width>
-             <height>50</height>
+             <width>20</width>
+             <height>40</height>
             </size>
            </property>
-           <property name="text">
-            <string>Assign</string>
-           </property>
-           <property name="icon">
-            <iconset resource="../resources.qrc">
-             <normaloff>:/resources/icons/assignTask.png</normaloff>:/resources/icons/assignTask.png</iconset>
-           </property>
-           <property name="iconSize">
-            <size>
-             <width>32</width>
-             <height>32</height>
-            </size>
-           </property>
-           <property name="toolButtonStyle">
-            <enum>Qt::ToolButtonTextUnderIcon</enum>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QToolButton" name="btnOnlyActive">
-           <property name="minimumSize">
-            <size>
-             <width>50</width>
-             <height>50</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Аvailable</string>
-           </property>
-           <property name="icon">
-            <iconset resource="../resources.qrc">
-             <normaloff>:/resources/icons/filter.png</normaloff>:/resources/icons/filter.png</iconset>
-           </property>
-           <property name="iconSize">
-            <size>
-             <width>32</width>
-             <height>32</height>
-            </size>
-           </property>
-           <property name="checkable">
-            <bool>true</bool>
-           </property>
-           <property name="toolButtonStyle">
-            <enum>Qt::ToolButtonTextUnderIcon</enum>
-           </property>
-          </widget>
+          </spacer>
          </item>
          <item>
           <widget class="QToolButton" name="btnCheck">
@@ -149,6 +100,61 @@
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QToolButton" name="btnOnlyActive">
+           <property name="minimumSize">
+            <size>
+             <width>50</width>
+             <height>50</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Аvailable</string>
+           </property>
+           <property name="icon">
+            <iconset resource="../resources.qrc">
+             <normaloff>:/resources/icons/filter.png</normaloff>:/resources/icons/filter.png</iconset>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>32</width>
+             <height>32</height>
+            </size>
+           </property>
+           <property name="checkable">
+            <bool>true</bool>
+           </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextUnderIcon</enum>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="btnAssignTask">
+           <property name="minimumSize">
+            <size>
+             <width>50</width>
+             <height>50</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Assign</string>
+           </property>
+           <property name="icon">
+            <iconset resource="../resources.qrc">
+             <normaloff>:/resources/icons/assignTask.png</normaloff>:/resources/icons/assignTask.png</iconset>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>32</width>
+             <height>32</height>
+            </size>
+           </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextUnderIcon</enum>
+           </property>
+          </widget>
+         </item>
         </layout>
        </item>
       </layout>
diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp
index e89387d..74c1a07 100644
--- a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp
+++ b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp
@@ -27,7 +27,7 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
     qDebug() << "FIMtasksWidget init thread ID " << QThread::currentThreadId();
 
     treeWidget = new QTreeWidget();
-    ui->horizontalLayout_1->addWidget(treeWidget);
+    ui->horizontalLayout_Tree->addWidget(treeWidget);
 
     connect(treeWidget, &QTreeWidget::currentItemChanged, this, &FIMtasksWidget::on_treeWidget_currentItemChanged);
 
@@ -60,7 +60,7 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
         //ui->horizontalLayout_3->addWidget(ui->btnAssignTask);
         //ui->horizontalLayout_3->addWidget(ui->btnCheck);
         //ui->horizontalLayout_3->addWidget(ui->btnDelete);
-        ui->horizontalLayout_3->setAlignment(Qt::AlignmentFlag::AlignLeft);
+        //ui->horizontalLayout_3->setAlignment(Qt::AlignmentFlag::AlignLeft);
 
         ui->btnDelete->setVisible(false);
         ui->btnCheck->setVisible(false);
@@ -78,7 +78,7 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
         ui->btnAssignTask->setVisible(false);
 
         //ui->verticalLayout->setAlignment(Qt::AlignmentFlag::AlignBottom);
-        ui->horizontalLayout_3->setAlignment(Qt::AlignmentFlag::AlignLeft);
+        //ui->horizontalLayout_3->setAlignment(Qt::AlignmentFlag::AlignLeft);
     }
 }
 
diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.ui b/InstructorsAndTrainees/tasks/fimtaskswidget.ui
index 7a7f7d9..adfc3ec 100644
--- a/InstructorsAndTrainees/tasks/fimtaskswidget.ui
+++ b/InstructorsAndTrainees/tasks/fimtaskswidget.ui
@@ -25,17 +25,23 @@
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout">
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_1"/>
+        <layout class="QHBoxLayout" name="horizontalLayout_Tree"/>
        </item>
        <item>
-        <layout class="QVBoxLayout" name="verticalLayout"/>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <layout class="QVBoxLayout" name="verticalLayout_Btn">
+         <item>
+          <spacer name="verticalSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
          <item>
           <widget class="QToolButton" name="btnAssignTask">
            <property name="minimumSize">
diff --git a/InstructorsAndTrainees/trainees/personalcardtrainee.ui b/InstructorsAndTrainees/trainees/personalcardtrainee.ui
index d82b7be..2ec22b9 100644
--- a/InstructorsAndTrainees/trainees/personalcardtrainee.ui
+++ b/InstructorsAndTrainees/trainees/personalcardtrainee.ui
@@ -197,7 +197,7 @@
         <item row="0" column="0">
          <widget class="QTabWidget" name="tabWidget">
           <property name="currentIndex">
-           <number>1</number>
+           <number>0</number>
           </property>
           <widget class="QWidget" name="tab">
            <attribute name="title">
@@ -205,26 +205,30 @@
            </attribute>
            <layout class="QGridLayout" name="gridLayout_5">
             <item row="0" column="0">
-             <layout class="QHBoxLayout" name="horizontalLayout_9">
+             <layout class="QHBoxLayout" name="horizontalLayout_AMM">
               <item>
-               <layout class="QVBoxLayout" name="verticalLayout_AMMcommon">
+               <layout class="QVBoxLayout" name="verticalLayout_AMM">
                 <item>
-                 <widget class="QLabel" name="label">
-                  <property name="text">
-                   <string>List</string>
-                  </property>
-                 </widget>
+                 <layout class="QVBoxLayout" name="verticalLayout_AMMcommon">
+                  <item>
+                   <widget class="QLabel" name="label">
+                    <property name="text">
+                     <string>List</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
                 </item>
-               </layout>
-              </item>
-              <item>
-               <layout class="QVBoxLayout" name="verticalLayout_AMMpersonal">
                 <item>
-                 <widget class="QLabel" name="label_2">
-                  <property name="text">
-                   <string>Attached</string>
-                  </property>
-                 </widget>
+                 <layout class="QVBoxLayout" name="verticalLayout_AMMpersonal">
+                  <item>
+                   <widget class="QLabel" name="label_2">
+                    <property name="text">
+                     <string>Attached</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
                 </item>
                </layout>
               </item>
@@ -238,26 +242,30 @@
            </attribute>
            <layout class="QGridLayout" name="gridLayout_4">
             <item row="0" column="0">
-             <layout class="QHBoxLayout" name="horizontalLayout_8">
+             <layout class="QHBoxLayout" name="horizontalLayout_FIM">
               <item>
-               <layout class="QVBoxLayout" name="verticalLayout_FIMcommon">
+               <layout class="QVBoxLayout" name="verticalLayout_FIM">
                 <item>
-                 <widget class="QLabel" name="label_3">
-                  <property name="text">
-                   <string>List</string>
-                  </property>
-                 </widget>
+                 <layout class="QVBoxLayout" name="verticalLayout_FIMcommon">
+                  <item>
+                   <widget class="QLabel" name="label_3">
+                    <property name="text">
+                     <string>List</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
                 </item>
-               </layout>
-              </item>
-              <item>
-               <layout class="QVBoxLayout" name="verticalLayout_FIMpersonal">
                 <item>
-                 <widget class="QLabel" name="label_4">
-                  <property name="text">
-                   <string>Attached</string>
-                  </property>
-                 </widget>
+                 <layout class="QVBoxLayout" name="verticalLayout_FIMpersonal">
+                  <item>
+                   <widget class="QLabel" name="label_4">
+                    <property name="text">
+                     <string>Attached</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
                 </item>
                </layout>
               </item>