Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp	(revision 41398)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp	(revision 41399)
@@ -402,7 +402,11 @@
     switch (m_type)
     {
+        case UIWizardType_CloneVM:
+            dRatio -= 0.4;
+            break;
         case UIWizardType_NewVD:
         case UIWizardType_CloneVD:
             dRatio += 0.1;
+            break;
         case UIWizardType_ExportAppliance:
             dRatio += 0.3;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic1.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic1.cpp	(revision 41398)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic1.cpp	(revision 41399)
@@ -20,5 +20,4 @@
 /* Global includes: */
 #include <QVBoxLayout>
-#include <QGroupBox>
 #include <QLineEdit>
 #include <QCheckBox>
@@ -56,19 +55,12 @@
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
     {
-        m_pLabel1 = new QIRichTextLabel(this);
-        m_pNameCnt = new QGroupBox(this);
+        m_pLabel = new QIRichTextLabel(this);
+        m_pNameEditor = new QLineEdit(this);
         {
-            QVBoxLayout *pNameCntLayout = new QVBoxLayout(m_pNameCnt);
-            {
-                m_pNameEditor = new QLineEdit(m_pNameCnt);
-                {
-                    m_pNameEditor->setText(UIWizardCloneVM::tr("%1 Clone").arg(m_strOriginalName));
-                }
-                pNameCntLayout->addWidget(m_pNameEditor);
-            }
+            m_pNameEditor->setText(UIWizardCloneVM::tr("%1 Clone").arg(m_strOriginalName));
         }
         m_pReinitMACsCheckBox = new QCheckBox(this);
-        pMainLayout->addWidget(m_pLabel1);
-        pMainLayout->addWidget(m_pNameCnt);
+        pMainLayout->addWidget(m_pLabel);
+        pMainLayout->addWidget(m_pNameEditor);
         pMainLayout->addWidget(m_pReinitMACsCheckBox);
         pMainLayout->addStretch();
@@ -89,8 +81,7 @@
 
     /* Translate widgets: */
-    m_pLabel1->setText(UIWizardCloneVM::tr("<p>Please choose a name for the new virtual machine. "
-                                           "The new machine will be a clone of the machine <b>%1</b>.</p>")
-                                           .arg(m_strOriginalName));
-    m_pNameCnt->setTitle(UIWizardCloneVM::tr("&Name"));
+    m_pLabel->setText(UIWizardCloneVM::tr("<p>Please choose a name for the new virtual machine. "
+                                          "The new machine will be a clone of the machine <b>%1</b>.</p>")
+                                          .arg(m_strOriginalName));
     m_pReinitMACsCheckBox->setToolTip(UIWizardCloneVM::tr("When checked a new unique MAC address will be assigned to all configured network cards."));
     m_pReinitMACsCheckBox->setText(UIWizardCloneVM::tr("&Reinitialize the MAC address of all network cards"));
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic1.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic1.h	(revision 41398)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic1.h	(revision 41399)
@@ -24,5 +24,4 @@
 
 /* Forward declarations: */
-class QGroupBox;
 class QLineEdit;
 class QCheckBox;
@@ -48,5 +47,4 @@
 
     /* Widgets: */
-    QGroupBox *m_pNameCnt;
     QLineEdit *m_pNameEditor;
     QCheckBox *m_pReinitMACsCheckBox;
@@ -77,5 +75,5 @@
 
     /* Widgets: */
-    QIRichTextLabel *m_pLabel1;
+    QIRichTextLabel *m_pLabel;
 };
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic2.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic2.cpp	(revision 41398)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic2.cpp	(revision 41399)
@@ -20,5 +20,4 @@
 /* Global includes: */
 #include <QVBoxLayout>
-#include <QGroupBox>
 #include <QRadioButton>
 #include <QButtonGroup>
@@ -47,24 +46,21 @@
     {
         m_pLabel = new QIRichTextLabel(this);
-        m_pCloneTypeCnt = new QGroupBox(this);
+        QVBoxLayout *pCloneTypeCntLayout = new QVBoxLayout;
         {
-            m_pButtonGroup = new QButtonGroup(m_pCloneTypeCnt);
+            m_pButtonGroup = new QButtonGroup(this);
             {
-                QVBoxLayout *pCloneTypeCntLayout = new QVBoxLayout(m_pCloneTypeCnt);
+                m_pFullCloneRadio = new QRadioButton(this);
                 {
-                    m_pFullCloneRadio = new QRadioButton(m_pCloneTypeCnt);
-                    {
-                        m_pFullCloneRadio->setChecked(true);
-                    }
-                    m_pLinkedCloneRadio = new QRadioButton(m_pCloneTypeCnt);
-                    pCloneTypeCntLayout->addWidget(m_pFullCloneRadio);
-                    pCloneTypeCntLayout->addWidget(m_pLinkedCloneRadio);
+                    m_pFullCloneRadio->setChecked(true);
                 }
+                m_pLinkedCloneRadio = new QRadioButton(this);
                 m_pButtonGroup->addButton(m_pFullCloneRadio);
                 m_pButtonGroup->addButton(m_pLinkedCloneRadio);
             }
+            pCloneTypeCntLayout->addWidget(m_pFullCloneRadio);
+            pCloneTypeCntLayout->addWidget(m_pLinkedCloneRadio);
         }
         pMainLayout->addWidget(m_pLabel);
-        pMainLayout->addWidget(m_pCloneTypeCnt);
+        pMainLayout->addLayout(pCloneTypeCntLayout);
         pMainLayout->addStretch();
     }
@@ -105,5 +101,4 @@
     m_pLabel->setText(strLabel);
 
-    m_pCloneTypeCnt->setTitle(UIWizardCloneVM::tr("&Type"));
     m_pFullCloneRadio->setText(UIWizardCloneVM::tr("Full clone"));
     m_pLinkedCloneRadio->setText(UIWizardCloneVM::tr("Linked clone"));
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic2.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic2.h	(revision 41398)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic2.h	(revision 41399)
@@ -24,5 +24,4 @@
 
 /* Forward declarations: */
-class QGroupBox;
 class QButtonGroup;
 class QRadioButton;
@@ -44,5 +43,4 @@
 
     /* Widgets: */
-    QGroupBox *m_pCloneTypeCnt;
     QButtonGroup *m_pButtonGroup;
     QRadioButton *m_pFullCloneRadio;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic3.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic3.cpp	(revision 41398)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic3.cpp	(revision 41399)
@@ -20,5 +20,4 @@
 /* Global includes: */
 #include <QVBoxLayout>
-#include <QGroupBox>
 #include <QRadioButton>
 
@@ -59,25 +58,22 @@
     {
         m_pLabel = new QIRichTextLabel(this);
-        m_pCloneModeCnt = new QGroupBox(this);
+        QVBoxLayout *pCloneModeCntLayout = new QVBoxLayout;
         {
-            QVBoxLayout *pCloneModeCntLayout = new QVBoxLayout(m_pCloneModeCnt);
+            m_pMachineRadio = new QRadioButton(this);
             {
-                m_pMachineRadio = new QRadioButton(m_pCloneModeCnt);
-                {
-                    m_pMachineRadio->setChecked(true);
-                }
-                m_pMachineAndChildsRadio = new QRadioButton(m_pCloneModeCnt);
-                {
-                    if (!m_fShowChildsOption)
-                       m_pMachineAndChildsRadio->hide();
-                }
-                m_pAllRadio = new QRadioButton(m_pCloneModeCnt);
-                pCloneModeCntLayout->addWidget(m_pMachineRadio);
-                pCloneModeCntLayout->addWidget(m_pMachineAndChildsRadio);
-                pCloneModeCntLayout->addWidget(m_pAllRadio);
+                m_pMachineRadio->setChecked(true);
             }
+            m_pMachineAndChildsRadio = new QRadioButton(this);
+            {
+                if (!m_fShowChildsOption)
+                   m_pMachineAndChildsRadio->hide();
+            }
+            m_pAllRadio = new QRadioButton(this);
+            pCloneModeCntLayout->addWidget(m_pMachineRadio);
+            pCloneModeCntLayout->addWidget(m_pMachineAndChildsRadio);
+            pCloneModeCntLayout->addWidget(m_pAllRadio);
         }
         pMainLayout->addWidget(m_pLabel);
-        pMainLayout->addWidget(m_pCloneModeCnt);
+        pMainLayout->addLayout(pCloneModeCntLayout);
         pMainLayout->addStretch();
     }
@@ -114,5 +110,4 @@
                           .arg(strOpt3));
 
-    m_pCloneModeCnt->setTitle(UIWizardCloneVM::tr("&Mode"));
     m_pMachineRadio->setText(UIWizardCloneVM::tr("Current machine state"));
     m_pMachineAndChildsRadio->setText(UIWizardCloneVM::tr("Current machine and all child states"));
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic3.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic3.h	(revision 41398)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic3.h	(revision 41399)
@@ -25,5 +25,4 @@
 
 /* Forward declaration: */
-class QGroupBox;
 class QRadioButton;
 class QIRichTextLabel;
@@ -45,5 +44,4 @@
 
     /* Widgets: */
-    QGroupBox *m_pCloneModeCnt;
     QRadioButton *m_pMachineRadio;
     QRadioButton *m_pMachineAndChildsRadio;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageExpert.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageExpert.cpp	(revision 41398)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageExpert.cpp	(revision 41399)
@@ -19,5 +19,5 @@
 
 /* Global includes: */
-#include <QVBoxLayout>
+#include <QGridLayout>
 #include <QButtonGroup>
 #include <QGroupBox>
@@ -36,5 +36,5 @@
 {
     /* Create widgets: */
-    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
+    QGridLayout *pMainLayout = new QGridLayout(this);
     {
         pMainLayout->setContentsMargins(8, 6, 8, 6);
@@ -88,9 +88,9 @@
         }
         m_pReinitMACsCheckBox = new QCheckBox(this);
-        pMainLayout->addWidget(m_pNameCnt);
-        pMainLayout->addWidget(m_pCloneTypeCnt);
-        pMainLayout->addWidget(m_pCloneModeCnt);
-        pMainLayout->addWidget(m_pReinitMACsCheckBox);
-        pMainLayout->addStretch();
+        pMainLayout->addWidget(m_pNameCnt, 0, 0, 1, 2);
+        pMainLayout->addWidget(m_pCloneTypeCnt, 1, 0, Qt::AlignTop);
+        pMainLayout->addWidget(m_pCloneModeCnt, 1, 1, Qt::AlignTop);
+        pMainLayout->addWidget(m_pReinitMACsCheckBox, 2, 0, 1, 2);
+        pMainLayout->setRowStretch(3, 1);
         sltButtonClicked(m_pFullCloneRadio);
     }
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageExpert.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageExpert.h	(revision 41398)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageExpert.h	(revision 41399)
@@ -24,4 +24,7 @@
 #include "UIWizardCloneVMPageBasic2.h"
 #include "UIWizardCloneVMPageBasic3.h"
+
+/* Forward declarations: */
+class QGroupBox;
 
 /* Expert page of the Clone Virtual Machine wizard: */
@@ -58,4 +61,9 @@
     bool isComplete() const;
     bool validatePage();
+
+    /* Widgets: */
+    QGroupBox *m_pNameCnt;
+    QGroupBox *m_pCloneTypeCnt;
+    QGroupBox *m_pCloneModeCnt;
 };