Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	(revision 87243)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	(revision 87244)
@@ -286,7 +286,9 @@
 }
 
-int UIWizardNewVMPage1::createNameOSTypeWidgets(QGridLayout *pLayout, bool fCreateLabels /* = true */)
-{
-    AssertReturn(pLayout, 0);
+QWidget *UIWizardNewVMPage1::createNameOSTypeWidgets(WizardMode mode, bool fCreateLabels /* = true */)
+{
+    Q_UNUSED(mode);
+    QWidget *pContainer = new QWidget;
+    QGridLayout *pLayout = new QGridLayout(pContainer);
     int iRow = 0;
     if (fCreateLabels)
@@ -344,5 +346,5 @@
     if (m_pSystemTypeEditor)
         pLayout->addWidget(m_pSystemTypeEditor, iRow++, 0, 1, 4);
-    return iRow;
+    return pContainer;
 }
 
@@ -517,8 +519,8 @@
 void UIWizardNewVMPageBasic1::prepare()
 {
-    QGridLayout *pPageLayout = new QGridLayout(this);
-    int iRow = createNameOSTypeWidgets(pPageLayout, false);
-    pPageLayout->addItem(new QSpacerItem(20, 40, QSizePolicy::Expanding, QSizePolicy::Expanding),
-                         iRow, 0, 1, 4);
+    QVBoxLayout *pPageLayout = new QVBoxLayout(this);
+    pPageLayout->addWidget(createNameOSTypeWidgets(WizardMode_Basic, false));
+    pPageLayout->addStretch();
+
     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 87243)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h	(revision 87244)
@@ -24,4 +24,5 @@
 /* Local includes: */
 #include "UIWizardPage.h"
+#include "UIExtraDataDefs.h"
 
 /* Forward declarations: */
@@ -76,5 +77,6 @@
     /** calls CVirtualBox::ComposeMachineFilename(...) and sets related member variables */
     void composeMachineFilePath();
-    /** Creates the page widgets and adds them into the @p pGridLayout. */
+
+    QWidget *createNameOSTypeWidgets(WizardMode mode, bool fCreateLabels = true);
     int createNameOSTypeWidgets(QGridLayout *pLayout, bool fCreateLabels = true);
     void setTypeByISODetectedOSType(const QString &strDetectedOSType);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp	(revision 87243)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp	(revision 87244)
@@ -44,5 +44,4 @@
 UIWizardNewVMPageExpert::UIWizardNewVMPageExpert(const QString &strGroup)
     : UIWizardNewVMPage1(strGroup)
-    , m_pNameAndSystemContainer(0)
     , m_pToolBox(0)
 {
@@ -51,15 +50,10 @@
     {
         m_pToolBox = new QToolBox;
-        m_pNameAndSystemContainer = new QWidget(this);
-        QGridLayout *pNameContainerLayout = new QGridLayout(m_pNameAndSystemContainer);
-        createNameOSTypeWidgets(pNameContainerLayout, false);
-        m_pGAInstallContainer = createGAInstallWidgets();
-        m_pUsernameHostnameContainer = createUserNameHostNameWidgets();
-
-        m_pToolBox->insertItem(ExpertToolboxItems_NameAndOSType, m_pNameAndSystemContainer, "");
+
+        m_pToolBox->insertItem(ExpertToolboxItems_NameAndOSType, createNameOSTypeWidgets(WizardMode_Expert, false), "");
         m_pToolBox->insertItem(ExpertToolboxItems_Disk, createDiskWidgets(), "");
         m_pToolBox->insertItem(ExpertToolboxItems_Hardware, createHardwareWidgets(), "");
-        m_pToolBox->insertItem(ExpertToolboxItems_UsernameHostname, m_pUsernameHostnameContainer, "");
-        m_pToolBox->insertItem(ExpertToolboxItems_GAInstall, m_pGAInstallContainer, "");
+        m_pToolBox->insertItem(ExpertToolboxItems_UsernameHostname, createUserNameHostNameWidgets(), "");
+        m_pToolBox->insertItem(ExpertToolboxItems_GAInstall, createGAInstallWidgets(), "");
         m_pToolBox->insertItem(ExpertToolboxItems_ProductKey, createProductKeyWidgets(), "");
         pMainLayout->addWidget(m_pToolBox);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.h	(revision 87243)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.h	(revision 87244)
@@ -110,8 +110,5 @@
     void disableEnableUnattendedRelatedWidgets(bool fEnabled);
     void markWidgets() const;
-    /** Widgets. */
-    QWidget *m_pNameAndSystemContainer;
-    QWidget *m_pGAInstallContainer;
-    QWidget *m_pUsernameHostnameContainer;
+
     QToolBox  *m_pToolBox;
 };