diff --git a/SampleForDoc/GacUI/UIRes/32bits/control_basic_window.bin b/SampleForDoc/GacUI/UIRes/32bits/control_basic_window.bin
index e65839fc..cf3beda3 100644
Binary files a/SampleForDoc/GacUI/UIRes/32bits/control_basic_window.bin and b/SampleForDoc/GacUI/UIRes/32bits/control_basic_window.bin differ
diff --git a/SampleForDoc/GacUI/UIRes/64bits/control_basic_window.bin b/SampleForDoc/GacUI/UIRes/64bits/control_basic_window.bin
index 39238866..e966916f 100644
Binary files a/SampleForDoc/GacUI/UIRes/64bits/control_basic_window.bin and b/SampleForDoc/GacUI/UIRes/64bits/control_basic_window.bin differ
diff --git a/SampleForDoc/GacUI/XmlRes/control_basic_window/Resource.xml b/SampleForDoc/GacUI/XmlRes/control_basic_window/Resource.xml
index f9a3b233..a825dd11 100644
--- a/SampleForDoc/GacUI/XmlRes/control_basic_window/Resource.xml
+++ b/SampleForDoc/GacUI/XmlRes/control_basic_window/Resource.xml
@@ -42,8 +42,13 @@
             var tct = cast (TabWindowTabTemplate*) tab.ControlTemplateObject;
             tct.SetTabHeaderContainer(wct.TabHeaderContainer);
 
-            tab.Pages.Add(new LoremIpsumTabPage*());
-            tab.Pages.Add(new LoremIpsumTabPage*());
+            attach(tct.AddPageRequested, func():void
+            {
+              var tabPage = new LoremIpsumTabPage*();
+              tab.Pages.Insert(0, tabPage);
+              tab.SelectedPage = tabPage;
+            });
+
             tab.Pages.Add(new LoremIpsumTabPage*());
           }
         ]]></ref.Ctor>
diff --git a/SampleForDoc/GacUI/XmlRes/control_basic_window/Tab.xml b/SampleForDoc/GacUI/XmlRes/control_basic_window/Tab.xml
index 1ca84c3f..a6be42c6 100644
--- a/SampleForDoc/GacUI/XmlRes/control_basic_window/Tab.xml
+++ b/SampleForDoc/GacUI/XmlRes/control_basic_window/Tab.xml
@@ -42,6 +42,8 @@
           headerContainer.AddChild(headerTable);
         }
       }
+
+      event AddPageRequested();
     ]]>
   </ref.Members>
   <TabTemplate ref.Name="self" ContainerComposition-ref="container" TabOrder="LeftToRight" MinSizeLimitation="LimitToElementAndChildren">
@@ -65,29 +67,46 @@
       </att.Columns>
 
       <Cell ref.Name="headerContainer" Site="row:0 column:0">
-        <Bounds ref.Name="headerTable" AlignmentToParent="left:0 top:0 right:0 bottom:0" MinSizeLimitation="LimitToElementAndChildren">
-          <RepeatFlow ref.Name="header" AlignmentToParent="left:0 top:-1 right:0 bottom:0" ExtraMargin="left:2 top:2 right:2 bottom:0" MinSizeLimitation="LimitToElementAndChildren">
-            <att.ItemTemplate>sample::TabWindowTabHeaderTemplate</att.ItemTemplate>
-            <att.ItemSource-bind>self.TabPages</att.ItemSource-bind>
-            <ev.ItemInserted-eval>
-              <![CDATA[
-                {
-                  var flowItem = header.FlowItems[arguments.itemIndex];
-                  var item = cast (TabWindowTabHeaderTemplate*) flowItem.Children[0];
-                  item.Commands = self.Commands;
-                  self.UpdateTabHeader();
-                }
-              ]]>
-            </ev.ItemInserted-eval>
-            <ev.ItemRemoved-eval>
-              <![CDATA[
-                {
-                  self.UpdateTabHeader();
-                }
-              ]]>
-            </ev.ItemRemoved-eval>
-          </RepeatFlow>
-        </Bounds>
+        <Table ref.Name="headerTable" AlignmentToParent="left:0 top:0 right:0 bottom:0" MinSizeLimitation="LimitToElementAndChildren">
+          <att.Rows>
+            <CellOption>composeType:Percentage percentage:1.0</CellOption>
+            <CellOption>composeType:MinSize</CellOption>
+            <CellOption>composeType:Percentage percentage:1.0</CellOption>
+          </att.Rows>
+          <att.Columns>
+            <CellOption>composeType:MinSize</CellOption>
+            <CellOption>composeType:Percentage percentage:1.0</CellOption>
+          </att.Columns>
+
+          <Cell Site="row:1 column:0" InternalMargin="left:2 top:0 right:2 bottom:0">
+            <Button Text="+" ev.Clicked-eval="self.AddPageRequested();">
+              <att.BoundsComposition-set AssociatedHitTestResult="Client"/>
+            </Button>
+          </Cell>
+          <Cell Site="row:0 column:1 rowSpan:3">
+            <RepeatFlow ref.Name="header" AlignmentToParent="left:0 top:-1 right:0 bottom:0" ExtraMargin="left:2 top:2 right:2 bottom:0" MinSizeLimitation="LimitToElementAndChildren">
+              <att.ItemTemplate>sample::TabWindowTabHeaderTemplate</att.ItemTemplate>
+              <att.ItemSource-bind>self.TabPages</att.ItemSource-bind>
+              <ev.ItemInserted-eval>
+                <![CDATA[
+                  {
+                    var flowItem = header.FlowItems[arguments.itemIndex];
+                    var item = cast (TabWindowTabHeaderTemplate*) flowItem.Children[0];
+                    item.Commands = self.Commands;
+                    self.UpdateTabHeader();
+                  }
+                ]]>
+              </ev.ItemInserted-eval>
+              <ev.ItemRemoved-eval>
+                <![CDATA[
+                  {
+                    self.UpdateTabHeader();
+                  }
+                ]]>
+              </ev.ItemRemoved-eval>
+            </RepeatFlow>
+          </Cell>
+        </Table>
       </Cell>
       <Cell Site="row:1 column:0">
         <SolidBackground Color="#007ACC"/>
diff --git a/SampleForDoc/GacUI/XmlRes/control_basic_window/TabHeaderButton.xml b/SampleForDoc/GacUI/XmlRes/control_basic_window/TabHeaderButton.xml
index a97605e6..44031fcc 100644
--- a/SampleForDoc/GacUI/XmlRes/control_basic_window/TabHeaderButton.xml
+++ b/SampleForDoc/GacUI/XmlRes/control_basic_window/TabHeaderButton.xml
@@ -25,13 +25,14 @@
       <att.Rows>
         <CellOption>composeType:Percentage percentage:1.0</CellOption>
         <CellOption>composeType:MinSize</CellOption>
+        <CellOption>composeType:Percentage percentage:1.0</CellOption>
       </att.Rows>
       <att.Columns>
         <CellOption>composeType:Percentage percentage:1.0</CellOption>
         <CellOption>composeType:MinSize</CellOption>
       </att.Columns>
 
-      <Cell Site="row:0 column:0 rowSpan:2">
+      <Cell Site="row:0 column:0 rowSpan:3">
         <SolidLabel Text-bind="self.Text" Font-bind="self.Font" HorizontalAlignment="Center" VerticalAlignment="Center">
           <att.Color-bind>
             <![CDATA[