Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	(revision 87239)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	(revision 87240)
@@ -278,28 +278,28 @@
 }
 
-void UIWizardNewVMPage1::addLine(QBoxLayout *pLayout)
+QFrame *UIWizardNewVMPage1::horizontalLine()
 {
     QFrame *line = new QFrame;
     line->setFrameShape(QFrame::HLine);
     line->setFrameShadow(QFrame::Sunken);
-    pLayout->addWidget(line);
-}
-
-void UIWizardNewVMPage1::createNameOSTypeWidgets(QVBoxLayout *pLayout, bool fCreateLabels /* = true */)
-{
-    AssertReturnVoid(pLayout);
-
+    return line;
+}
+
+int UIWizardNewVMPage1::createNameOSTypeWidgets(QGridLayout *pLayout, bool fCreateLabels /* = true */)
+{
+    AssertReturn(pLayout, 0);
+    int iRow = 0;
     if (fCreateLabels)
     {
         m_pNameOSTypeLabel = new QIRichTextLabel;
         if (m_pNameOSTypeLabel)
-            pLayout->addWidget(m_pNameOSTypeLabel);
+            pLayout->addWidget(m_pNameOSTypeLabel, iRow++, 0, 1, 4);
     }
 
     m_pNameAndFolderEditor = new UINameAndSystemEditor(0, true, true, false);
     if (m_pNameAndFolderEditor)
-        pLayout->addWidget(m_pNameAndFolderEditor);
-
-    addLine(pLayout);
+        pLayout->addWidget(m_pNameAndFolderEditor, iRow++, 0, 1, 4);
+
+    pLayout->addWidget(horizontalLine(), iRow++, 0, 1, 4);
 
     if (fCreateLabels)
@@ -307,10 +307,9 @@
         m_pUnattendedLabel = new QIRichTextLabel;
         if (m_pUnattendedLabel)
-            pLayout->addWidget(m_pUnattendedLabel);
-    }
-
-    QGridLayout *pUnattendedInstall = new QGridLayout;
+            pLayout->addWidget(m_pUnattendedLabel, iRow++, 0, 1, 4);
+    }
+
     m_pEnableUnattendedInstallCheckBox = new QCheckBox;
-    pUnattendedInstall->addWidget(m_pEnableUnattendedInstallCheckBox, 0, 0, 1, 4, Qt::AlignLeft);
+    pLayout->addWidget(m_pEnableUnattendedInstallCheckBox, iRow++, 0, 1, 2, Qt::AlignLeft);
 
     m_pISOSelectorLabel = new QLabel;
@@ -320,5 +319,5 @@
         m_pISOSelectorLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
         m_pISOSelectorLabel->setEnabled(false);
-        pUnattendedInstall->addWidget(m_pISOSelectorLabel, 1, 0, 1, 1, Qt::AlignRight);
+        pLayout->addWidget(m_pISOSelectorLabel, iRow, 0, 1, 1, Qt::AlignRight);
     }
     m_pISOFilePathSelector = new UIFilePathSelector;
@@ -330,5 +329,5 @@
         m_pISOFilePathSelector->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
         m_pISOFilePathSelector->setEnabled(false);
-        pUnattendedInstall->addWidget(m_pISOFilePathSelector, 1, 1, 1, 4);
+        pLayout->addWidget(m_pISOFilePathSelector, iRow++, 1, 1, 3);
     }
 
@@ -337,12 +336,13 @@
     {
         m_pStartHeadlessCheckBox->setEnabled(false);
-        pUnattendedInstall->addWidget(m_pStartHeadlessCheckBox, 2, 1, 1, 1);
-    }
-    pLayout->addLayout(pUnattendedInstall);
-    addLine(pLayout);
+        pLayout->addWidget(m_pStartHeadlessCheckBox, iRow++, 1, 1, 1);
+    }
+
+    pLayout->addWidget(horizontalLine(), iRow++, 0, 1, 4);
+
     m_pSystemTypeEditor = new UINameAndSystemEditor(0, false, false, true);
     if (m_pSystemTypeEditor)
-        pLayout->addWidget(m_pSystemTypeEditor);
-
+        pLayout->addWidget(m_pSystemTypeEditor, iRow++, 0, 1, 4);
+    return iRow;
 }
 
@@ -517,7 +517,8 @@
 void UIWizardNewVMPageBasic1::prepare()
 {
-    QVBoxLayout *pPageLayout = new QVBoxLayout(this);
-    createNameOSTypeWidgets(pPageLayout, false);
-    pPageLayout->addStretch();
+    QGridLayout *pPageLayout = new QGridLayout(this);
+    int iRow = createNameOSTypeWidgets(pPageLayout, false);
+    pPageLayout->addItem(new QSpacerItem(20, 40, QSizePolicy::Expanding, QSizePolicy::Expanding),
+                         iRow, 0, 1, 4);
     createConnections();
     /* Register fields: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h	(revision 87239)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h	(revision 87240)
@@ -28,7 +28,8 @@
 class QBoxLayout;
 class QCheckBox;
+class QFrame;
 class QLabel;
 class QRadioButton;
-class QVBoxLayout;
+class QGridLayout;
 class QIRichTextLabel;
 class UIFilePathSelector;
@@ -76,5 +77,5 @@
     void composeMachineFilePath();
     /** Creates the page widgets and adds them into the @p pGridLayout. */
-    void createNameOSTypeWidgets(QVBoxLayout *pLayout, bool fCreateLabels = true);
+    int createNameOSTypeWidgets(QGridLayout *pLayout, bool fCreateLabels = true);
     void setTypeByISODetectedOSType(const QString &strDetectedOSType);
     /** Colors the widgets red if they cause isComplete to fail. */
@@ -103,5 +104,5 @@
 
     bool checkISOFile() const;
-    void addLine(QBoxLayout *pLayout);
+    QFrame *horizontalLine();
 
     /** Full path (including the file name) of the machine's configuration file. */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp	(revision 87239)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp	(revision 87240)
@@ -52,5 +52,5 @@
         m_pToolBox = new QToolBox;
         m_pNameAndSystemContainer = new QWidget(this);
-        QVBoxLayout *pNameContainerLayout = new QVBoxLayout(m_pNameAndSystemContainer);
+        QGridLayout *pNameContainerLayout = new QGridLayout(m_pNameAndSystemContainer);
         createNameOSTypeWidgets(pNameContainerLayout, false);
         m_pGAInstallContainer = createGAInstallWidgets();