Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp	(revision 84283)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp	(revision 84284)
@@ -36,8 +36,9 @@
     : UIWizardNewCloudVMPage2(fFullWizard)
     , m_pCntLocation(0)
+    , m_pCntSource(0)
     , m_pSettingsCnt(0)
 {
     /* Create main layout: */
-    QHBoxLayout *pMainLayout = new QHBoxLayout(this);
+    QGridLayout *pMainLayout = new QGridLayout(this);
     if (pMainLayout)
     {
@@ -110,7 +111,24 @@
                     pLocationLayout->addWidget(m_pAccountPropertyTable);
                 }
-
+            }
+
+            /* Add into layout: */
+            pMainLayout->addWidget(m_pCntLocation, 0, 0);
+        }
+
+        /* Create source container: */
+        m_pCntSource = new QGroupBox(this);
+        if (m_pCntSource)
+        {
+            /* There is no source table in short wizard form: */
+            if (!m_fFullWizard)
+                m_pCntSource->setVisible(false);
+
+            /* Create source layout: */
+            QVBoxLayout *pSourceLayout = new QVBoxLayout(m_pCntSource);
+            if (pSourceLayout)
+            {
                 /* Create source image list: */
-                m_pSourceImageList = new QListWidget(m_pCntLocation);
+                m_pSourceImageList = new QListWidget(m_pCntSource);
                 if (m_pSourceImageList)
                 {
@@ -125,10 +143,10 @@
 
                     /* Add into layout: */
-                    pLocationLayout->addWidget(m_pSourceImageList);
+                    pSourceLayout->addWidget(m_pSourceImageList);
                 }
             }
 
             /* Add into layout: */
-            pMainLayout->addWidget(m_pCntLocation);
+            pMainLayout->addWidget(m_pCntSource, 1, 0);
         }
 
@@ -158,5 +176,5 @@
 
             /* Add into layout: */
-            pMainLayout->addWidget(m_pSettingsCnt);
+            pMainLayout->addWidget(m_pSettingsCnt, 0, 1, 2, 1);
         }
     }
@@ -213,4 +231,7 @@
     }
 
+    /* Translate source container: */
+    m_pCntSource->setTitle(UIWizardNewCloudVM::tr("Source"));
+
     /* Translate settings container: */
     m_pSettingsCnt->setTitle(UIWizardNewCloudVM::tr("Settings"));
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.h	(revision 84283)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.h	(revision 84284)
@@ -83,4 +83,6 @@
     /** Holds the location container instance. */
     QGroupBox *m_pCntLocation;
+    /** Holds the source container instance. */
+    QGroupBox *m_pCntSource;
     /** Holds the settings container instance. */
     QGroupBox *m_pSettingsCnt;
