diff --git a/src/admc/console_widget/console_widget.cpp b/src/admc/console_widget/console_widget.cpp
index b93840d55..2564086cd 100644
--- a/src/admc/console_widget/console_widget.cpp
+++ b/src/admc/console_widget/console_widget.cpp
@@ -149,8 +149,8 @@ ConsoleWidget::ConsoleWidget(QWidget *parent)
     description_layout->setContentsMargins(0, 0, 0, 0);
     description_layout->setSpacing(0);
     d->description_bar->setLayout(description_layout);
-    description_layout->addWidget(d->description_bar_left);
     description_layout->addSpacing(10);
+    description_layout->addWidget(d->description_bar_left);
     description_layout->addStretch();
     description_layout->addWidget(d->description_bar_right);
     description_layout->addSpacing(10);
diff --git a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.ui b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.ui
index 95d9c051a..514f1f68e 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.ui
+++ b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.ui
@@ -35,7 +35,7 @@
       <bool>true</bool>
      </property>
      <property name="title">
-      <string>Password Settings</string>
+      <string/>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_3">
       <property name="leftMargin">
@@ -84,10 +84,10 @@
         <item>
          <spacer name="verticalSpacer_7">
           <property name="orientation">
-           <enum>Qt::Vertical</enum>
+           <enum>Qt::Orientation::Vertical</enum>
           </property>
           <property name="sizeType">
-           <enum>QSizePolicy::Minimum</enum>
+           <enum>QSizePolicy::Policy::Minimum</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -122,7 +122,7 @@
            <bool>false</bool>
           </property>
           <property name="buttonSymbols">
-           <enum>QAbstractSpinBox::NoButtons</enum>
+           <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
           </property>
           <property name="maximum">
            <number>99</number>
@@ -135,10 +135,10 @@
         <item>
          <spacer name="verticalSpacer_8">
           <property name="orientation">
-           <enum>Qt::Vertical</enum>
+           <enum>Qt::Orientation::Vertical</enum>
           </property>
           <property name="sizeType">
-           <enum>QSizePolicy::Minimum</enum>
+           <enum>QSizePolicy::Policy::Minimum</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -173,17 +173,17 @@
            <bool>false</bool>
           </property>
           <property name="buttonSymbols">
-           <enum>QAbstractSpinBox::NoButtons</enum>
+           <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
           </property>
          </widget>
         </item>
         <item>
          <spacer name="verticalSpacer_9">
           <property name="orientation">
-           <enum>Qt::Vertical</enum>
+           <enum>Qt::Orientation::Vertical</enum>
           </property>
           <property name="sizeType">
-           <enum>QSizePolicy::Minimum</enum>
+           <enum>QSizePolicy::Policy::Minimum</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -221,7 +221,7 @@
            <bool>false</bool>
           </property>
           <property name="buttonSymbols">
-           <enum>QAbstractSpinBox::NoButtons</enum>
+           <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
           </property>
           <property name="suffix">
            <string/>
@@ -234,10 +234,10 @@
         <item>
          <spacer name="verticalSpacer_10">
           <property name="orientation">
-           <enum>Qt::Vertical</enum>
+           <enum>Qt::Orientation::Vertical</enum>
           </property>
           <property name="sizeType">
-           <enum>QSizePolicy::Minimum</enum>
+           <enum>QSizePolicy::Policy::Minimum</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -272,7 +272,7 @@
            <bool>false</bool>
           </property>
           <property name="buttonSymbols">
-           <enum>QAbstractSpinBox::NoButtons</enum>
+           <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
           </property>
           <property name="value">
            <number>0</number>
@@ -282,10 +282,10 @@
         <item>
          <spacer name="verticalSpacer_11">
           <property name="orientation">
-           <enum>Qt::Vertical</enum>
+           <enum>Qt::Orientation::Vertical</enum>
           </property>
           <property name="sizeType">
-           <enum>QSizePolicy::Minimum</enum>
+           <enum>QSizePolicy::Policy::Minimum</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -298,7 +298,7 @@
         <item>
          <widget class="QCheckBox" name="complexity_req_checkbox">
           <property name="layoutDirection">
-           <enum>Qt::LeftToRight</enum>
+           <enum>Qt::LayoutDirection::LeftToRight</enum>
           </property>
           <property name="text">
            <string>Enable complexity requirements</string>
@@ -324,7 +324,7 @@
         <item>
          <spacer name="verticalSpacer_2">
           <property name="orientation">
-           <enum>Qt::Vertical</enum>
+           <enum>Qt::Orientation::Vertical</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -342,7 +342,7 @@
          <number>4</number>
         </property>
         <property name="sizeConstraint">
-         <enum>QLayout::SetDefaultConstraint</enum>
+         <enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
         </property>
         <item>
          <widget class="QLabel" name="precedence_label">
@@ -378,7 +378,7 @@
            <bool>false</bool>
           </property>
           <property name="buttonSymbols">
-           <enum>QAbstractSpinBox::NoButtons</enum>
+           <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
           </property>
           <property name="specialValueText">
            <string/>
@@ -391,10 +391,10 @@
         <item>
          <spacer name="verticalSpacer_4">
           <property name="orientation">
-           <enum>Qt::Vertical</enum>
+           <enum>Qt::Orientation::Vertical</enum>
           </property>
           <property name="sizeType">
-           <enum>QSizePolicy::Minimum</enum>
+           <enum>QSizePolicy::Policy::Minimum</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -429,7 +429,7 @@
            <bool>false</bool>
           </property>
           <property name="buttonSymbols">
-           <enum>QAbstractSpinBox::NoButtons</enum>
+           <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
           </property>
           <property name="value">
            <number>0</number>
@@ -439,10 +439,10 @@
         <item>
          <spacer name="verticalSpacer_5">
           <property name="orientation">
-           <enum>Qt::Vertical</enum>
+           <enum>Qt::Orientation::Vertical</enum>
           </property>
           <property name="sizeType">
-           <enum>QSizePolicy::Minimum</enum>
+           <enum>QSizePolicy::Policy::Minimum</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -477,7 +477,7 @@
            <bool>false</bool>
           </property>
           <property name="buttonSymbols">
-           <enum>QAbstractSpinBox::NoButtons</enum>
+           <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
           </property>
           <property name="suffix">
            <string/>
@@ -490,10 +490,10 @@
         <item>
          <spacer name="verticalSpacer_6">
           <property name="orientation">
-           <enum>Qt::Vertical</enum>
+           <enum>Qt::Orientation::Vertical</enum>
           </property>
           <property name="sizeType">
-           <enum>QSizePolicy::Minimum</enum>
+           <enum>QSizePolicy::Policy::Minimum</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -525,7 +525,7 @@
            </size>
           </property>
           <property name="buttonSymbols">
-           <enum>QAbstractSpinBox::NoButtons</enum>
+           <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
           </property>
           <property name="value">
            <number>0</number>
@@ -535,7 +535,7 @@
         <item>
          <spacer name="verticalSpacer_3">
           <property name="orientation">
-           <enum>Qt::Vertical</enum>
+           <enum>Qt::Orientation::Vertical</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -550,7 +550,7 @@
       <item>
        <spacer name="horizontalSpacer">
         <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+         <enum>Qt::Orientation::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
@@ -566,7 +566,7 @@
    <item>
     <widget class="Line" name="line">
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Orientation::Horizontal</enum>
      </property>
     </widget>
    </item>
@@ -574,7 +574,6 @@
     <widget class="QGroupBox" name="groupBox">
      <property name="font">
       <font>
-       <weight>50</weight>
        <bold>false</bold>
       </font>
      </property>
@@ -625,7 +624,7 @@
         <item>
          <spacer name="verticalSpacer">
           <property name="orientation">
-           <enum>Qt::Vertical</enum>
+           <enum>Qt::Orientation::Vertical</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
diff --git a/src/admc/results_widgets/pso_results_widget/pso_results_widget.cpp b/src/admc/results_widgets/pso_results_widget/pso_results_widget.cpp
index e948d823c..739f183d2 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_results_widget.cpp
+++ b/src/admc/results_widgets/pso_results_widget/pso_results_widget.cpp
@@ -27,11 +27,10 @@
 #include <QModelIndex>
 // #include <QDebug>
 
-
-PSOResultsWidget::PSOResultsWidget(QWidget *parent) :
-    ResultsWidgetBase(parent), pso_edit_widget(new PSOEditWidget(this)) {
-
-    ui->verticalLayout->addWidget(pso_edit_widget);
+PSOResultsWidget::PSOResultsWidget(QWidget *parent)
+: ResultsWidgetBase(parent)
+, pso_edit_widget(new PSOEditWidget(this)) {
+    ui->verticalLayout->insertWidget(0, pso_edit_widget);
 }
 
 void PSOResultsWidget::update(const QModelIndex &index) {
diff --git a/src/admc/results_widgets/results_widget_base.ui b/src/admc/results_widgets/results_widget_base.ui
index 9e23c524e..4af6b5926 100644
--- a/src/admc/results_widgets/results_widget_base.ui
+++ b/src/admc/results_widgets/results_widget_base.ui
@@ -28,6 +28,19 @@
    </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Orientation::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
      <item>
       <widget class="QPushButton" name="edit_button">
        <property name="minimumSize">
@@ -61,19 +74,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
     </layout>
    </item>
   </layout>