diff --git a/commonbuttongroupwidget.ui b/commonbuttongroupwidget.ui
index 7d3b9d6..d5a87d2 100644
--- a/commonbuttongroupwidget.ui
+++ b/commonbuttongroupwidget.ui
@@ -6,10 +6,22 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>501</width>
-    <height>95</height>
+    <width>520</width>
+    <height>45</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>520</width>
+    <height>45</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
@@ -18,8 +30,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>491</width>
-     <height>40</height>
+     <width>520</width>
+     <height>45</height>
     </rect>
    </property>
    <property name="sizePolicy">
@@ -30,8 +42,8 @@
    </property>
    <property name="minimumSize">
     <size>
-     <width>0</width>
-     <height>40</height>
+     <width>520</width>
+     <height>45</height>
     </size>
    </property>
    <property name="maximumSize">
@@ -42,13 +54,13 @@
    </property>
    <layout class="QHBoxLayout" name="downlayout">
     <property name="spacing">
-     <number>10</number>
+     <number>5</number>
     </property>
     <property name="leftMargin">
      <number>0</number>
     </property>
     <property name="topMargin">
-     <number>5</number>
+     <number>0</number>
     </property>
     <property name="rightMargin">
      <number>0</number>
diff --git a/debug/commonbuttongroupwidget.o b/debug/commonbuttongroupwidget.o
index 9b578c5..cffded4 100644
Binary files a/debug/commonbuttongroupwidget.o and b/debug/commonbuttongroupwidget.o differ
diff --git a/mainwindow.ui b/mainwindow.ui
index 058be01..31e9c9b 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -897,9 +897,9 @@
     <property name="geometry">
      <rect>
       <x>540</x>
-      <y>552</y>
+      <y>550</y>
       <width>250</width>
-      <height>35</height>
+      <height>40</height>
      </rect>
     </property>
     <property name="sizePolicy">
@@ -911,13 +911,13 @@
     <property name="minimumSize">
      <size>
       <width>250</width>
-      <height>35</height>
+      <height>40</height>
      </size>
     </property>
     <property name="maximumSize">
      <size>
       <width>1500</width>
-      <height>35</height>
+      <height>40</height>
      </size>
     </property>
     <property name="text">
@@ -934,12 +934,19 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>550</y>
-      <width>521</width>
+      <y>549</y>
+      <width>531</width>
       <height>41</height>
      </rect>
     </property>
-    <layout class="QVBoxLayout" name="changButtonGroup"/>
+    <layout class="QVBoxLayout" name="changButtonGroup">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+    </layout>
    </widget>
    <zorder>mainFrame</zorder>
    <zorder>horizontalWidget</zorder>
diff --git a/ui_commonbuttongroupwidget.h b/ui_commonbuttongroupwidget.h
index 918fbd8..c5ed38e 100644
--- a/ui_commonbuttongroupwidget.h
+++ b/ui_commonbuttongroupwidget.h
@@ -31,21 +31,24 @@ public:
     {
         if (CommonButtonGroupWidget->objectName().isEmpty())
             CommonButtonGroupWidget->setObjectName(QString::fromUtf8("CommonButtonGroupWidget"));
-        CommonButtonGroupWidget->resize(501, 95);
-        downLayout = new QWidget(CommonButtonGroupWidget);
-        downLayout->setObjectName(QString::fromUtf8("downLayout"));
-        downLayout->setGeometry(QRect(0, 0, 491, 40));
+        CommonButtonGroupWidget->resize(520, 45);
         QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
         sizePolicy.setHorizontalStretch(0);
         sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(CommonButtonGroupWidget->sizePolicy().hasHeightForWidth());
+        CommonButtonGroupWidget->setSizePolicy(sizePolicy);
+        CommonButtonGroupWidget->setMinimumSize(QSize(520, 45));
+        downLayout = new QWidget(CommonButtonGroupWidget);
+        downLayout->setObjectName(QString::fromUtf8("downLayout"));
+        downLayout->setGeometry(QRect(0, 0, 520, 45));
         sizePolicy.setHeightForWidth(downLayout->sizePolicy().hasHeightForWidth());
         downLayout->setSizePolicy(sizePolicy);
-        downLayout->setMinimumSize(QSize(0, 40));
+        downLayout->setMinimumSize(QSize(520, 45));
         downLayout->setMaximumSize(QSize(16777215, 40));
         downlayout = new QHBoxLayout(downLayout);
-        downlayout->setSpacing(10);
+        downlayout->setSpacing(5);
         downlayout->setObjectName(QString::fromUtf8("downlayout"));
-        downlayout->setContentsMargins(0, 5, 0, 5);
+        downlayout->setContentsMargins(0, 0, 0, 5);
         loadingProgressBar = new QProgressBar(downLayout);
         loadingProgressBar->setObjectName(QString::fromUtf8("loadingProgressBar"));
         QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Minimum);
diff --git a/ui_instructorbuttongroupwidget.h b/ui_instructorbuttongroupwidget.h
index 2fd38dd..23562e2 100644
--- a/ui_instructorbuttongroupwidget.h
+++ b/ui_instructorbuttongroupwidget.h
@@ -30,28 +30,51 @@ public:
     {
         if (InstructorButtonGroupWidget->objectName().isEmpty())
             InstructorButtonGroupWidget->setObjectName(QString::fromUtf8("InstructorButtonGroupWidget"));
-        InstructorButtonGroupWidget->resize(513, 53);
+        InstructorButtonGroupWidget->resize(520, 45);
+        QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(InstructorButtonGroupWidget->sizePolicy().hasHeightForWidth());
+        InstructorButtonGroupWidget->setSizePolicy(sizePolicy);
+        InstructorButtonGroupWidget->setMinimumSize(QSize(520, 45));
         instructorButtonGroup = new QWidget(InstructorButtonGroupWidget);
         instructorButtonGroup->setObjectName(QString::fromUtf8("instructorButtonGroup"));
         instructorButtonGroup->setEnabled(true);
-        instructorButtonGroup->setGeometry(QRect(0, 0, 513, 51));
+        instructorButtonGroup->setGeometry(QRect(0, 0, 520, 45));
+        sizePolicy.setHeightForWidth(instructorButtonGroup->sizePolicy().hasHeightForWidth());
+        instructorButtonGroup->setSizePolicy(sizePolicy);
+        instructorButtonGroup->setMinimumSize(QSize(520, 45));
         updateButtonGroup = new QHBoxLayout(instructorButtonGroup);
+        updateButtonGroup->setSpacing(5);
         updateButtonGroup->setObjectName(QString::fromUtf8("updateButtonGroup"));
+        updateButtonGroup->setContentsMargins(0, 0, 0, 5);
         loadToServerButton = new QPushButton(instructorButtonGroup);
         loadToServerButton->setObjectName(QString::fromUtf8("loadToServerButton"));
+        QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Minimum);
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(loadToServerButton->sizePolicy().hasHeightForWidth());
+        loadToServerButton->setSizePolicy(sizePolicy1);
         loadToServerButton->setMinimumSize(QSize(0, 35));
+        loadToServerButton->setMaximumSize(QSize(16777215, 40));
 
         updateButtonGroup->addWidget(loadToServerButton);
 
         undoChangesButton = new QPushButton(instructorButtonGroup);
         undoChangesButton->setObjectName(QString::fromUtf8("undoChangesButton"));
+        sizePolicy1.setHeightForWidth(undoChangesButton->sizePolicy().hasHeightForWidth());
+        undoChangesButton->setSizePolicy(sizePolicy1);
         undoChangesButton->setMinimumSize(QSize(0, 35));
+        undoChangesButton->setMaximumSize(QSize(16777215, 40));
 
         updateButtonGroup->addWidget(undoChangesButton);
 
         startWithCurrentChangesButton = new QPushButton(instructorButtonGroup);
         startWithCurrentChangesButton->setObjectName(QString::fromUtf8("startWithCurrentChangesButton"));
+        sizePolicy1.setHeightForWidth(startWithCurrentChangesButton->sizePolicy().hasHeightForWidth());
+        startWithCurrentChangesButton->setSizePolicy(sizePolicy1);
         startWithCurrentChangesButton->setMinimumSize(QSize(0, 35));
+        startWithCurrentChangesButton->setMaximumSize(QSize(16777215, 40));
 
         updateButtonGroup->addWidget(startWithCurrentChangesButton);
 
diff --git a/ui_mainwindow.h b/ui_mainwindow.h
index 3627cfc..f117d7d 100644
--- a/ui_mainwindow.h
+++ b/ui_mainwindow.h
@@ -436,20 +436,21 @@ public:
         offlineStartButton = new QPushButton(centralwidget);
         offlineStartButton->setObjectName(QString::fromUtf8("offlineStartButton"));
         offlineStartButton->setEnabled(true);
-        offlineStartButton->setGeometry(QRect(540, 552, 250, 35));
+        offlineStartButton->setGeometry(QRect(540, 550, 250, 40));
         QSizePolicy sizePolicy5(QSizePolicy::Preferred, QSizePolicy::Minimum);
         sizePolicy5.setHorizontalStretch(0);
         sizePolicy5.setVerticalStretch(0);
         sizePolicy5.setHeightForWidth(offlineStartButton->sizePolicy().hasHeightForWidth());
         offlineStartButton->setSizePolicy(sizePolicy5);
-        offlineStartButton->setMinimumSize(QSize(250, 35));
-        offlineStartButton->setMaximumSize(QSize(1500, 35));
+        offlineStartButton->setMinimumSize(QSize(250, 40));
+        offlineStartButton->setMaximumSize(QSize(1500, 40));
         offlineStartButton->setCheckable(false);
         offlineStartButton->setChecked(false);
         verticalLayoutWidget = new QWidget(centralwidget);
         verticalLayoutWidget->setObjectName(QString::fromUtf8("verticalLayoutWidget"));
-        verticalLayoutWidget->setGeometry(QRect(10, 550, 521, 41));
+        verticalLayoutWidget->setGeometry(QRect(10, 549, 531, 41));
         changButtonGroup = new QVBoxLayout(verticalLayoutWidget);
+        changButtonGroup->setSpacing(0);
         changButtonGroup->setObjectName(QString::fromUtf8("changButtonGroup"));
         changButtonGroup->setContentsMargins(0, 0, 0, 0);
         MainWindow->setCentralWidget(centralwidget);