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/create_dialogs/create_user_dialog.cpp b/src/admc/create_dialogs/create_user_dialog.cpp
index 5cd8aa826..2ebbdde07 100644
--- a/src/admc/create_dialogs/create_user_dialog.cpp
+++ b/src/admc/create_dialogs/create_user_dialog.cpp
@@ -45,6 +45,7 @@ CreateUserDialog::CreateUserDialog(AdInterface &ad, const QString &parent_dn, co
     }
     ui->middle_name_edit->setVisible(show_middle_name);
     ui->middle_name_label->setVisible(show_middle_name);
+    setTabOrder(ui->last_name_edit, ui->middle_name_edit);
 
     auto first_name_edit = new StringEdit(ui->first_name_edit, ATTRIBUTE_FIRST_NAME, this);
     auto last_name_edit = new StringEdit(ui->last_name_edit, ATTRIBUTE_LAST_NAME, this);
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>