Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIUserNamePasswordEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIUserNamePasswordEditor.cpp	(revision 87248)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIUserNamePasswordEditor.cpp	(revision 87249)
@@ -217,5 +217,9 @@
     if (!pLabel)
         return;
-    pLayout->addWidget(pLabel, iRow, 0, 1, 1, Qt::AlignRight);
+    pLabel->setAlignment(Qt::AlignRight);
+    pLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
+
+    pLayout->addWidget(pLabel, iRow, 0, 1, 1);
+
 
     pLineEdit = new T;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp	(revision 87248)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp	(revision 87249)
@@ -18,4 +18,5 @@
 /* Qt includes: */
 #include <QAbstractButton>
+#include <QLayout>
 
 /* GUI includes: */
@@ -563,2 +564,13 @@
     return getStringFieldValue("guestOSFamiyId").contains("windows", Qt::CaseInsensitive);
 }
+
+void UIWizardNewVM::increaseLayoutLeftMargin(QLayout *pLayout, float mult /* = 2 */)
+{
+    if (!pLayout)
+        return;
+    QMargins margins = pLayout->contentsMargins();
+    pLayout->setContentsMargins(mult * margins.left(),
+                                margins.top(),
+                                margins.right(),
+                                margins.bottom());
+}
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h	(revision 87248)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h	(revision 87249)
@@ -84,4 +84,6 @@
     bool isUnattendedInstallEnabled() const;
     bool isGuestOSTypeWindows() const;
+    /** Increases the amoun of the left marign of @p pLayout. */
+    static void increaseLayoutLeftMargin(QLayout *pLayout, float mult = 2);
 
 protected:
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	(revision 87248)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	(revision 87249)
@@ -286,9 +286,12 @@
 }
 
-QWidget *UIWizardNewVMPage1::createNameOSTypeWidgets(WizardMode mode, bool fCreateLabels /* = true */)
-{
-    Q_UNUSED(mode);
+QWidget *UIWizardNewVMPage1::createNameOSTypeWidgets(bool fIncreaseLeftIndent, bool fCreateLabels /* = true */)
+{
+    Q_UNUSED(fIncreaseLeftIndent);
     QWidget *pContainer = new QWidget;
     QGridLayout *pLayout = new QGridLayout(pContainer);
+    if (fIncreaseLeftIndent)
+        UIWizardNewVM::increaseLayoutLeftMargin(pLayout);
+
     int iRow = 0;
     if (fCreateLabels)
@@ -520,5 +523,5 @@
 {
     QVBoxLayout *pPageLayout = new QVBoxLayout(this);
-    pPageLayout->addWidget(createNameOSTypeWidgets(WizardMode_Basic, false));
+    pPageLayout->addWidget(createNameOSTypeWidgets(/* fIncreaseLeftIndent */ false, /* fCreateLabels */false));
     pPageLayout->addStretch();
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h	(revision 87248)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h	(revision 87249)
@@ -78,5 +78,5 @@
     void composeMachineFilePath();
 
-    QWidget *createNameOSTypeWidgets(WizardMode mode, bool fCreateLabels = true);
+    QWidget *createNameOSTypeWidgets(bool fIncreaseLeftIndent, bool fCreateLabels = true);
     int createNameOSTypeWidgets(QGridLayout *pLayout, bool fCreateLabels = true);
     void setTypeByISODetectedOSType(const QString &strDetectedOSType);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.cpp	(revision 87248)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.cpp	(revision 87249)
@@ -118,24 +118,33 @@
 }
 
-QWidget *UIWizardNewVMPage2::createUserNameHostNameWidgets()
+QWidget *UIWizardNewVMPage2::createUserNameHostNameWidgets(bool fIncreaseLeftIndent)
 {
     QWidget *pContainer = new QWidget;
     QGridLayout *pGridLayout = new QGridLayout(pContainer);
-    pGridLayout->setContentsMargins(0, 0, 0, 0);
+
+    if (fIncreaseLeftIndent)
+        UIWizardNewVM::increaseLayoutLeftMargin(pGridLayout);
 
     m_pUserNamePasswordEditor = new UIUserNamePasswordEditor;
-    pGridLayout->addWidget(m_pUserNamePasswordEditor, 0, 0, 3, 4);
+    pGridLayout->addWidget(m_pUserNamePasswordEditor, 0, 0, 1, 4);
+
     m_pHostnameLabel = new QLabel;
+    m_pHostnameLabel->setAlignment(Qt::AlignRight);
+    m_pHostnameLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
+
     m_pHostnameLineEdit = new QLineEdit;
-    pGridLayout->addWidget(m_pHostnameLabel, 3, 0, 1, 1, Qt::AlignRight);
-    pGridLayout->addWidget(m_pHostnameLineEdit, 3, 1, 1, 3);
+
+    pGridLayout->addWidget(m_pHostnameLabel,    1, 0, 1, 1);
+    pGridLayout->addWidget(m_pHostnameLineEdit, 1, 1, 1, 3);
+
     return pContainer;
 }
 
-QWidget *UIWizardNewVMPage2::createGAInstallWidgets()
+QWidget *UIWizardNewVMPage2::createGAInstallWidgets(bool fIncreaseLeftIndent)
 {
     QWidget *pContainer = new QWidget;
     QGridLayout *pContainerLayout = new QGridLayout(pContainer);
-    pContainerLayout->setContentsMargins(0, 0, 0, 0);
+    if (fIncreaseLeftIndent)
+        UIWizardNewVM::increaseLayoutLeftMargin(pContainerLayout);
 
     m_pInstallGACheckBox = new QCheckBox;
@@ -160,14 +169,19 @@
 }
 
-QWidget *UIWizardNewVMPage2::createProductKeyWidgets()
+QWidget *UIWizardNewVMPage2::createProductKeyWidgets(bool fIncreaseLeftIndent)
 {
     QWidget *pContainer = new QWidget;
     QGridLayout *pGridLayout = new QGridLayout(pContainer);
-    pGridLayout->setContentsMargins(0, 0, 0, 0);
+    if (fIncreaseLeftIndent)
+        UIWizardNewVM::increaseLayoutLeftMargin(pGridLayout);
 
     m_pProductKeyLabel = new QLabel;
+    m_pProductKeyLabel->setAlignment(Qt::AlignRight);
+
+    m_pProductKeyLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
+
     m_pProductKeyLineEdit = new QLineEdit;
     m_pProductKeyLineEdit->setInputMask(">NNNNN-NNNNN-NNNNN-NNNNN-NNNNN;#");
-    pGridLayout->addWidget(m_pProductKeyLabel, 0, 0, 1, 1, Qt::AlignRight);
+    pGridLayout->addWidget(m_pProductKeyLabel, 0, 0, 1, 1);
     pGridLayout->addWidget(m_pProductKeyLineEdit, 0, 1, 1, 3);
     return pContainer;
@@ -226,8 +240,7 @@
     }
 
-    m_pToolBox->insertItem(ToolBoxItems_UserNameHostname, createUserNameHostNameWidgets(), QString());
-    m_pToolBox->insertItem(ToolBoxItems_GAInstall, createGAInstallWidgets(), QString());
-    m_pToolBox->insertItem(ToolBoxItems_ProductKey, createProductKeyWidgets(), QString());
-    m_pToolBox->setStyleSheet("QToolBox::tab:selected { font: bold; }");
+    m_pToolBox->insertItem(ToolBoxItems_UserNameHostname, createUserNameHostNameWidgets(/* fIncreaseLeftIndent */ true), QString());
+    m_pToolBox->insertItem(ToolBoxItems_GAInstall, createGAInstallWidgets(/* fIncreaseLeftIndent */ true), QString());
+    m_pToolBox->insertItem(ToolBoxItems_ProductKey, createProductKeyWidgets(/* fIncreaseLeftIndent */ true), QString());
 
     registerField("userName", this, "userName");
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.h	(revision 87248)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.h	(revision 87249)
@@ -67,7 +67,7 @@
     };
 
-    QWidget *createUserNameHostNameWidgets();
-    QWidget *createGAInstallWidgets();
-    QWidget *createProductKeyWidgets();
+    QWidget *createUserNameHostNameWidgets(bool fIncreaseLeftIndent);
+    QWidget *createGAInstallWidgets(bool fIncreaseLeftIndent);
+    QWidget *createProductKeyWidgets(bool fIncreaseLeftIndent);
 
     bool checkGAISOFile() const;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.cpp	(revision 87248)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.cpp	(revision 87249)
@@ -164,9 +164,11 @@
 }
 
-QWidget *UIWizardNewVMPage3::createDiskWidgets()
+QWidget *UIWizardNewVMPage3::createDiskWidgets(bool fIncreaseLeftIndent)
 {
     QWidget *pDiskContainer = new QWidget;
     QGridLayout *pDiskLayout = new QGridLayout(pDiskContainer);
-    pDiskLayout->setContentsMargins(0, 0, 0, 0);
+    if (fIncreaseLeftIndent)
+        UIWizardNewVM::increaseLayoutLeftMargin(pDiskLayout);
+
 
     m_pDiskSkip = new QRadioButton;
@@ -195,9 +197,10 @@
 }
 
-QWidget *UIWizardNewVMPage3::createHardwareWidgets()
+QWidget *UIWizardNewVMPage3::createHardwareWidgets(bool fIncreaseLeftIndent)
 {
     QWidget *pHardwareContainer = new QWidget;
     QGridLayout *pHardwareLayout = new QGridLayout(pHardwareContainer);
-    pHardwareLayout->setContentsMargins(0, 0, 0, 0);
+    if (fIncreaseLeftIndent)
+        UIWizardNewVM::increaseLayoutLeftMargin(pHardwareLayout);
     m_pBaseMemoryEditor = new UIBaseMemoryEditor(0, true);
     m_pVirtualCPUEditor = new UIVirtualCPUEditor(0, true);
@@ -230,6 +233,6 @@
     pMainLayout->addWidget(m_pToolBox);
 
-    m_pToolBox->insertItem(ToolBoxItems_Disk, createDiskWidgets(), QString());
-    m_pToolBox->insertItem(ToolBoxItems_Hardware, createHardwareWidgets(), QString());
+    m_pToolBox->insertItem(ToolBoxItems_Disk, createDiskWidgets(/* fIncreaseLeftIndent */ true), QString());
+    m_pToolBox->insertItem(ToolBoxItems_Hardware, createHardwareWidgets(/* fIncreaseLeftIndent */ true), QString());
     m_pToolBox->setStyleSheet("QToolBox::tab:selected { font: bold; }");
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.h	(revision 87248)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.h	(revision 87249)
@@ -77,6 +77,6 @@
     /** @} */
 
-    QWidget *createDiskWidgets();
-    QWidget *createHardwareWidgets();
+    QWidget *createDiskWidgets(bool fIncreaseLeftIndent);
+    QWidget *createHardwareWidgets(bool fIncreaseLeftIndent);
 
     /** Helpers. */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp	(revision 87248)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp	(revision 87249)
@@ -50,15 +50,17 @@
     {
         m_pToolBox = new QToolBox;
-
-        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, createUserNameHostNameWidgets(), "");
-        m_pToolBox->insertItem(ExpertToolboxItems_GAInstall, createGAInstallWidgets(), "");
-        m_pToolBox->insertItem(ExpertToolboxItems_ProductKey, createProductKeyWidgets(), "");
+        m_pToolBox->insertItem(ExpertToolboxItems_NameAndOSType, createNameOSTypeWidgets(/* fIncreaseLeftIndent */ true,
+                                                                                         /* fCreateLabels */ false), "");
+        m_pToolBox->insertItem(ExpertToolboxItems_Disk, createDiskWidgets(/* fIncreaseLeftIndent */ true), "");
+        m_pToolBox->insertItem(ExpertToolboxItems_Hardware, createHardwareWidgets(/* fIncreaseLeftIndent */ true), "");
+        m_pToolBox->insertItem(ExpertToolboxItems_UsernameHostname, createUserNameHostNameWidgets(/* fIncreaseLeftIndent */ true), "");
+        m_pToolBox->insertItem(ExpertToolboxItems_GAInstall, createGAInstallWidgets(/* fIncreaseLeftIndent */ true), "");
+        m_pToolBox->insertItem(ExpertToolboxItems_ProductKey, createProductKeyWidgets(/* fIncreaseLeftIndent */ true), "");
         pMainLayout->addWidget(m_pToolBox);
+
         pMainLayout->addStretch();
         updateVirtualDiskSource();
     }
+
 
     createConnections();