diff --git a/Tutorial/GacUI_Controls/ColorPicker2/UI/Resource.xml b/Tutorial/GacUI_Controls/ColorPicker2/UI/Resource.xml
index c8e305f9..09c7d799 100644
--- a/Tutorial/GacUI_Controls/ColorPicker2/UI/Resource.xml
+++ b/Tutorial/GacUI_Controls/ColorPicker2/UI/Resource.xml
@@ -66,7 +66,7 @@
                 <att.DropdownControl>
                   <GroupBox Text="Choose a Color:">
                     <SharedSizeRoot AlignmentToParent="left:0 top:0 right:0 bottom:0" MinSizeLimitation="LimitToElementAndChildren">
-                      <RepeatFlow AlignmentToParent="left:1 top:1 right:1 bottom:1" MinSizeLimitation="LimitToElementAndChildren">
+                      <RepeatFlow RowPadding="2" ColumnPadding="2" AlignmentToParent="left:1 top:1 right:1 bottom:1" MinSizeLimitation="LimitToElementAndChildren">
                         <att.ItemTemplate>demo::ColorBomboItemTemplate</att.ItemTemplate>
                         <att.ItemSource-eval>ViewModel.ColorItems</att.ItemSource-eval>
                       </RepeatFlow>
@@ -104,7 +104,7 @@
                 </Cell>
 
                 <Cell Site="row:0 column:2 rowSpan:3">
-                  <SolidLabel Text-eval="ViewModel.ItemName" Font-bind="self.Font" Color="#FFFFFF" Ellipse="true" VerticalAlignment="Center"/>
+                  <SolidLabel Text-eval="ViewModel.ItemName" Font-bind="self.Font" Color="#FFFFFF" VerticalAlignment="Center"/>
                 </Cell>
               </Table>
             </Button>
diff --git a/Tutorial/GacUI_Controls/ColorPicker2/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/ColorPicker2/UI/Source/DemoPartialClasses.cpp
index aa40d19d..f310eadf 100644
--- a/Tutorial/GacUI_Controls/ColorPicker2/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Controls/ColorPicker2/UI/Source/DemoPartialClasses.cpp
@@ -303,9 +303,6 @@ namespace demo
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_6.Obj())->SetVerticalAlignment(::vl::presentation::Alignment::Center);
 		}
-		{
-			::vl::__vwsn::This(this->__vwsn_precompile_6.Obj())->SetEllipse(true);
-		}
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_6.Obj())->SetColor(::vl::__vwsn::Parse<::vl::presentation::Color>(::vl::WString::Unmanaged(L"#FFFFFF")));
 		}
@@ -453,6 +450,12 @@ Class (::demo::MainWindowConstructor)
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_7)->SetItemTemplate(vl::Func(::vl_workflow_global::__vwsnf2_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)));
 		}
+		{
+			::vl::__vwsn::This(this->__vwsn_precompile_7)->SetColumnPadding(static_cast<::vl::vint>(2));
+		}
+		{
+			::vl::__vwsn::This(this->__vwsn_precompile_7)->SetRowPadding(static_cast<::vl::vint>(2));
+		}
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_7)->SetMinSizeLimitation(::vl::presentation::compositions::GuiGraphicsComposition::MinSizeLimitation::LimitToElementAndChildren);
 		}