From 47fe040bb568b4eff544bb9f287481343216373e Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Mon, 1 Feb 2016 23:31:22 +0100
Subject: [PATCH] debug and improvments

---
 Crow.csproj                              |   5 +-
 Crow.userprefs                           |  20 +-
 Images/Icons/updown.svg                  |  59 ++--
 MonoDevelop.GOLib/src/GOLibGtkHost.cs    |   2 +-
 Templates/ArrowButTemplate.crow          |  14 +
 Templates/Button.crow                    |  14 +
 Templates/ComboBox.goml                  |   2 +-
 Templates/Expandable.goml                |   2 +-
 Templates/MessageBox.goml                |  12 +-
 Templates/Popper.goml                    |   2 +-
 Templates/ScrollBar.goml                 |   8 +-
 Templates/Spinner.goml                   |  13 +-
 Templates/Window.goml                    |   8 +-
 Tests/GOLIBTest_4.cs                     |  12 +-
 Tests/GOLIBTests.cs                      |  29 +-
 Tests/Interfaces/test4.1.goml            |  14 +-
 Tests/Interfaces/test4.goml              |  20 +-
 Tests/Interfaces/test5.goml              |   4 +-
 Tests/Interfaces/test6.goml              |   8 +-
 Tests/Interfaces/testButton.crow         | 322 ++++++++++++++++++++
 Tests/Interfaces/testImage.crow          |  87 ++++++
 Tests/Interfaces/testTextBox.crow        |  16 +
 Tests/Interfaces/testWindow.goml         |  32 +-
 Tests/Interfaces/testWindow2.goml        |   8 +-
 Tests/Interfaces/test_Listbox.goml       |   4 +-
 Tests/Tests.csproj                       |  12 +-
 UnitTest/Interfaces/testButton.crow      | 322 ++++++++++++++++++++
 UnitTest/Interfaces/testImage.crow       |  81 +++++
 UnitTest/NUnitCrowWindow.cs              |  10 +-
 UnitTest/UnitTest.csproj                 |   7 +
 src/BmpPicture.cs                        |  25 +-
 src/BubblingMouseButtonEventArgs.cs      |  14 +
 src/CompilerServices/CompilerServices.cs |   2 +-
 src/GraphicObjects/Border.cs             |  12 +-
 src/GraphicObjects/Button.cs             | 110 ++++---
 src/GraphicObjects/ComboBox.cs           |   4 +-
 src/GraphicObjects/GenericStack.cs       |   3 +
 src/GraphicObjects/GraphicObject.cs      | 169 +++++++----
 src/GraphicObjects/Group.cs              |   4 +-
 src/GraphicObjects/ILayoutable.cs        |   2 +-
 src/GraphicObjects/Image.cs              |  51 ++--
 src/GraphicObjects/Label.cs              | 368 ++++++++++++-----------
 src/GraphicObjects/NumericControl.cs     |   4 -
 src/GraphicObjects/Popper.cs             |   4 +-
 src/GraphicObjects/Scroller.cs           |   2 +-
 src/GraphicObjects/Slider.cs             |   8 +-
 src/GraphicObjects/TextBox.cs            |  11 +-
 src/GraphicObjects/Window.cs             | 233 +++++++-------
 src/Interface.cs                         |  44 +--
 src/OpenTKGameWindow.cs                  |  98 +++---
 src/Picture.cs                           |   2 +-
 src/SvgPicture.cs                        |  26 +-
 52 files changed, 1675 insertions(+), 670 deletions(-)
 create mode 100755 Templates/ArrowButTemplate.crow
 create mode 100755 Templates/Button.crow
 create mode 100755 Tests/Interfaces/testButton.crow
 create mode 100755 Tests/Interfaces/testImage.crow
 create mode 100755 Tests/Interfaces/testTextBox.crow
 create mode 100755 UnitTest/Interfaces/testButton.crow
 create mode 100755 UnitTest/Interfaces/testImage.crow
 create mode 100644 src/BubblingMouseButtonEventArgs.cs

diff --git a/Crow.csproj b/Crow.csproj
index b65f3170..bc8842f5 100644
--- a/Crow.csproj
+++ b/Crow.csproj
@@ -46,7 +46,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>TRACE;DEBUG;__linux__;DEBUG_LOAD_TIME0;DEBUG_LAYOUTING0;DEBUG_BINDING0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;__linux__;DEBUG_LOAD_TIME0;DEBUG_LAYOUTING;DEBUG_BINDING0;DEBUG_CLIP_RECTANGLE0</DefineConstants>
   </PropertyGroup>
   <!--  <PropertyGroup Condition=" '$(Platform)' == 'Linux_x86' ">
     <DefineConstants>__linux__</DefineConstants>
@@ -129,6 +129,7 @@
     <Compile Include="src\GraphicObjects\ComboBox.cs" />
     <Compile Include="src\GraphicObjects\GroupBox.cs" />
     <Compile Include="src\GraphicObjects\ScrollBar.cs" />
+    <Compile Include="src\BubblingMouseButtonEventArgs.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -213,6 +214,8 @@
     <EmbeddedResource Include="Templates\GroupBox.goml" />
     <EmbeddedResource Include="Templates\ListBox.goml" />
     <EmbeddedResource Include="Templates\ScrollBar.goml" />
+    <EmbeddedResource Include="Templates\Button.crow" />
+    <EmbeddedResource Include="Templates\ArrowButTemplate.crow" />
   </ItemGroup>
   <ItemGroup>
     <None Include="README.md" />
diff --git a/Crow.userprefs b/Crow.userprefs
index b554ec85..6a3db521 100644
--- a/Crow.userprefs
+++ b/Crow.userprefs
@@ -1,16 +1,18 @@
 <Properties GitUserInfo="UsingGIT" StartupItem="Tests/Tests.csproj">
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|Linux_x86" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="src/GraphicObjects/TemplatedControl.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="src/GraphicObjects/GraphicObject.cs">
     <Files>
-      <File FileName="src/GraphicObjects/GraphicObject.cs" Line="848" Column="39" />
-      <File FileName="Tests/GOLIBTests.cs" Line="41" Column="1" />
-      <File FileName="Tests/Interfaces/testWindow3.goml" Line="10" Column="6" />
-      <File FileName="src/GraphicObjects/TemplatedControl.cs" Line="114" Column="1" />
-      <File FileName="src/GraphicObjects/Window.cs" Line="214" Column="1" />
-      <File FileName="src/GraphicObjects/TemplatedContainer.cs" Line="80" Column="19" />
-      <File FileName="src/GraphicObjects/Container.cs" Line="31" Column="1" />
-      <File FileName="src/GraphicObjects/PrivateContainer.cs" Line="67" Column="1" />
+      <File FileName="src/GraphicObjects/GraphicObject.cs" Line="572" Column="23" />
+      <File FileName="src/GraphicObjects/Label.cs" Line="15" Column="5" />
+      <File FileName="src/OpenTKGameWindow.cs" Line="114" Column="1" />
+      <File FileName="Tests/GOLIBTests.cs" Line="156" Column="32" />
+      <File FileName="src/GraphicObjects/TextBox.cs" Line="15" Column="31" />
     </Files>
+    <Pads>
+      <Pad Id="MonoDevelop.Debugger.WatchPad">
+        <State />
+      </Pad>
+    </Pads>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
     <BreakpointStore>
diff --git a/Images/Icons/updown.svg b/Images/Icons/updown.svg
index ce045245..0df81756 100644
--- a/Images/Icons/updown.svg
+++ b/Images/Icons/updown.svg
@@ -5,17 +5,13 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 65.480012 51.479989"
-   height="51.479988"
-   width="65.480011"
-   id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="updown.svg">
-<!--  <metadata
-     id="metadata13">
+   id="svg2"
+   width="44.717388"
+   height="31.938803"
+   viewBox="0 0 44.717389 31.938803">
+  <metadata
+     id="metadata11">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -26,44 +22,23 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1260"
-     inkscape:window-height="644"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="3.2415936"
-     inkscape:cx="30.089585"
-     inkscape:cy="-4.9619855"
-     inkscape:window-x="0"
-     inkscape:window-y="16"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />-->
+  <defs
+     id="defs9" />
+ 
   <g
-     id="up"
-     transform="matrix(0.88780545,0,0,0.79362094,4.0529638,4.3893292)">
+     transform="matrix(0.81305037,0,0,0.79847006,-3.6589183,-5.1900554)"
+     id="up">
     <path
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 32,9 7,44 57,44 Z"
        id="path4144"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       d="M 32,9 7,44 57,44 Z"
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
   <g
-     id="down"
-     transform="matrix(0.88780545,0,0,0.79362094,4.0529638,4.3893292)">
+     transform="matrix(0.81305037,0,0,0.79847006,-3.6589183,-5.1900554)"
+     id="down">
     <path
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 7,9 57,9 32,44 Z"
        id="path4144-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       d="M 7,9 57,9 32,44 Z"
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/MonoDevelop.GOLib/src/GOLibGtkHost.cs b/MonoDevelop.GOLib/src/GOLibGtkHost.cs
index ea45e679..f9e7e599 100644
--- a/MonoDevelop.GOLib/src/GOLibGtkHost.cs
+++ b/MonoDevelop.GOLib/src/GOLibGtkHost.cs
@@ -527,7 +527,7 @@ namespace MonoDevelop.GOLib
 			}
 		}
 
-		public IGOLibHost TopContainer {
+		public IGOLibHost HostContainer {
 			get { return this as IGOLibHost; }
 		}
 
diff --git a/Templates/ArrowButTemplate.crow b/Templates/ArrowButTemplate.crow
new file mode 100755
index 00000000..b1ba7796
--- /dev/null
+++ b/Templates/ArrowButTemplate.crow
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--<HorizontalStack Spacing="1" Height="100" Width="300">
+	<Image Margin="2" Width="14" Height="14" Path="{../../Image}"  SvgSub="{../../SvgSub}"/>
+	<Label Text="{../../Caption}" Height="80" Width="200"/>
+</HorizontalStack>-->
+<Border Name="Content"
+	Background="Gray" Foreground="DarkGray" 
+	Height="{../TemplatedHeight}" Width="{../TemplatedWidth}"
+	MouseEnter="{Foreground=White}"
+	MouseLeave="{Foreground=DarkGray}"
+	MouseDown="{Background=LightGray}"
+	MouseUp="{Background=Gray}"
+	>
+</Border>
\ No newline at end of file
diff --git a/Templates/Button.crow b/Templates/Button.crow
new file mode 100755
index 00000000..f33db837
--- /dev/null
+++ b/Templates/Button.crow
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--<HorizontalStack Spacing="1" Height="100" Width="300">
+	<Image Margin="2" Width="14" Height="14" Path="{../../Image}"  SvgSub="{../../SvgSub}"/>
+	<Label Text="{../../Caption}" Height="80" Width="200"/>
+</HorizontalStack>-->
+<Border Fit="True" Background="Gray" MinimumSize="50;20" Foreground="Gray" CornerRadius="3" 
+	MouseEnter="{Foreground=White;caption.Foreground=White}"
+	MouseLeave="{Foreground=Gray;caption.Foreground=Black}"
+	MouseDown="{Background=LightGray}"
+	MouseUp="{Background=Gray}"
+	>
+<!--	<Image Height="0" Width="0" Margin="0" Path="{../../Image}" SvgSub="{../../SvgSub}"/>-->
+	<Label Name="caption" Margin="5" Foreground="Black" Text="{../../Caption}"/>
+</Border>
\ No newline at end of file
diff --git a/Templates/ComboBox.goml b/Templates/ComboBox.goml
index f60b1a1a..56c4792b 100755
--- a/Templates/ComboBox.goml
+++ b/Templates/ComboBox.goml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Border CornerRadius="0" BorderColor="LightGray" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">
+<Border CornerRadius="0" Foreground="LightGray" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">
 	<HorizontalStack Margin="1" Spacing="1" Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}">
 		<Label Margin="1" Foreground="Black" Background="White" Text="{../../../Caption}" 
 			Height="{../../../TemplatedHeight}" Width="{../../../TemplatedWidth}"/>
diff --git a/Templates/Expandable.goml b/Templates/Expandable.goml
index 740200ca..49665f99 100755
--- a/Templates/Expandable.goml
+++ b/Templates/Expandable.goml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Border BorderWidth="1" BorderColor="LightGray" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}" 
+<Border BorderWidth="1" Foreground="LightGray" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}" 
 		MouseClick="../onMouseClick">
 	<VerticalStack Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}">
 		<HorizontalStack Spacing="1" Height="-1" Width="{../../../TemplatedWidth}">
diff --git a/Templates/MessageBox.goml b/Templates/MessageBox.goml
index d6e474c0..7620645a 100644
--- a/Templates/MessageBox.goml
+++ b/Templates/MessageBox.goml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<Border Height="{../TemplatedHeight}" Width="{../TemplatedWidth}" BorderWidth="1" BorderColor="White" CornerRadius="10" >
+<Border Height="{../TemplatedHeight}" Width="{../TemplatedWidth}" BorderWidth="1" Foreground="White" CornerRadius="10" >
 	<VerticalStack Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}" Background="0,4;0,4;0,4;0,4">
-		<Border BorderWidth="1" BorderColor="White" Width="{../../../TemplatedWidth}" Height="-1" 
+		<Border BorderWidth="1" Foreground="White" Width="{../../../TemplatedWidth}" Height="-1" 
 				Background="0,1;0,5;1,0;0,5">
 			<HorizontalStack Name="hs" Margin="1" Spacing="1" Width="{../../../../TemplatedWidth}" Height="-1" >
 				<GraphicObject Width="5" Height="5"/>
 				<Image Margin="1" Width="12" Height="12" Path="{../../../../../Icon}"/>
 				<Label Foreground="White" Width="{../../../../../TemplatedWidth}" Margin="1" TextAlignment="Center" Text="{../../../../../Title}" />
-				<Border CornerRadius="6" BorderWidth="1" BorderColor="Transparent"  Height="12" Width="12"
-					MouseEnter="{BorderColor=White}" MouseLeave="{BorderColor=Transparent}">
+				<Border CornerRadius="6" BorderWidth="1" Foreground="Transparent"  Height="12" Width="12"
+					MouseEnter="{Foreground=White}" MouseLeave="{Foreground=Transparent}">
 					<Image Focusable="true" Name="Image" Margin="0" Width="0" Height="0" Path="#Crow.Images.Icons.exit2.svg"
 						 MouseClick="../../../../../../butQuitPress"/>
 				</Border>
@@ -23,8 +23,8 @@
 		</HorizontalStack>
 		<HorizontalStack Height="-1" Width="{../../../TemplatedWidth}" Margin="3">
 			<GraphicObject Height="5"/>
-			<Button Text="Ok"/>
-			<Button Text="Cancel"/>
+			<Button Caption="Ok"/>
+			<Button Caption="Cancel"/>
 		</HorizontalStack>
 	</VerticalStack>
 </Border>
diff --git a/Templates/Popper.goml b/Templates/Popper.goml
index f819e351..4555a470 100755
--- a/Templates/Popper.goml
+++ b/Templates/Popper.goml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Border BorderWidth="1" BorderColor="LightGray" Height="-1" Width="{../TemplatedWidth}" MouseClick="../onMouseClick">
+<Border BorderWidth="1" Foreground="LightGray" Height="-1" Width="{../TemplatedWidth}" MouseClick="../onMouseClick">
 	<HorizontalStack Spacing="1" Height="-1"  Width="{../../TemplatedWidth}">
 		<Image Margin="2" Width="12" Height="12" Path="{../../../Image}" SvgSub="{../../../SvgSub}"/>
 		<Label Text="{../../../Caption}"  Width="{../../../TemplatedWidth}"/>
diff --git a/Templates/ScrollBar.goml b/Templates/ScrollBar.goml
index b14c90da..03e1d327 100755
--- a/Templates/ScrollBar.goml
+++ b/Templates/ScrollBar.goml
@@ -1,13 +1,15 @@
 <?xml version="1.0"?>
-<Border BorderWidth="1" BorderColor="LightGray" Width="{../TemplatedWidth}" Height="{../TemplatedHeight}">
+<Border BorderWidth="1" Foreground="LightGray" Width="{../TemplatedWidth}" Height="{../TemplatedHeight}">
 	<GenericStack Orientation="{../../Orientation}" Width="{../../TemplatedWidth}" Height="{../../TemplatedHeight}">
-		<Button Width="12" Height="12" MouseClick="../../../onScrollBack">
+		<Button MouseRepeat="true" Width="12" Height="8" MouseClick="../../../onScrollBack"
+			Template="#Crow.Templates.ArrowButTemplate.crow">
 			<Image Margin="1" Path="#Crow.Images.Icons.updown.svg" SvgSub="up"/>
 		</Button>
 		<Slider Name="Slider" Value="{../../../Scroll}" Maximum="{../../../MaximumScroll}" 
 			Width="{../../../TemplatedWidth}" Height="{../../../TemplatedHeight}" Orientation="{../../../Orientation}"
 			ValueChanged="../../../onSliderValueChange"/>
-		<Button Width="12" Height="12" MouseClick="../../../onScrollForth">
+		<Button MouseRepeat="true" Width="12" Height="8" MouseClick="../../../onScrollForth"
+			Template="#Crow.Templates.ArrowButTemplate.crow">
 			<Image Margin="1" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
 		</Button>
 	</GenericStack>
diff --git a/Templates/Spinner.goml b/Templates/Spinner.goml
index 059456f7..b8330fcd 100755
--- a/Templates/Spinner.goml
+++ b/Templates/Spinner.goml
@@ -1,13 +1,18 @@
 <?xml version="1.0"?>
-<Border BorderWidth="1" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}" Background="White">
+<Border BorderWidth="1" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}"
+	Foreground="Gray"
+	Background="White">
 	<HorizontalStack Name="hstack" Margin="0" Spacing="2" Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}">
 		<Label Foreground="DimGray" Height="{../../../TemplatedHeight}" Width="{../../../TemplatedWidth}" 
 			Text="{../../../Value}" Margin="1" TextAlignment="RightCenter"/>
-		<VerticalStack Width="-1" Height="{../../../TemplatedHeight}" Spacing="1" >
-			<Button Width="12" Height="8" MouseClick="../../../../onUp">
+		<VerticalStack Width="-1" Height="{../../../TemplatedHeight}" Spacing="0" >
+			<Button MouseRepeat="true" Width="12" Height="8" MouseClick="../../../../onUp"
+				Template="#Crow.Templates.ArrowButTemplate.crow">
 				<Image Margin="1" Path="#Crow.Images.Icons.updown.svg" SvgSub="up"/>
 			</Button>
-			<Button Width="12" Height="8" MouseClick="../../../../onDown">
+				
+			<Button MouseRepeat="true" Width="12" Height="8" MouseClick="../../../../onDown" 
+				Template="#Crow.Templates.ArrowButTemplate.crow">
 				<Image Margin="1" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
 			</Button>
 		</VerticalStack>
diff --git a/Templates/Window.goml b/Templates/Window.goml
index af04c9af..cde66a53 100755
--- a/Templates/Window.goml
+++ b/Templates/Window.goml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<Border BorderWidth="1" BorderColor="White" CornerRadius="20" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">
+<Border BorderWidth="1" Foreground="White" CornerRadius="20" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">
 	<VerticalStack Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}">
-		<Border BorderWidth="1" BorderColor="White" Width="{../../../TemplatedWidth}" Height="-1" 
+		<Border Name="TitleBar" BorderWidth="1" Foreground="White" Width="{../../../TemplatedWidth}" Height="-1" 
 				Background="0,1;0,5;1,0;0,5">
 			<HorizontalStack Name="hs" Margin="1" Spacing="1" Width="{../../../../TemplatedWidth}" Height="-1" >
 				<GraphicObject Width="5"/>
 				<Image Margin="1" Width="12" Height="12" Path="{../../../../../Icon}"/>
 				<Label Foreground="White" Width="{../../../../../TemplatedWidth}" Margin="1" TextAlignment="Center" Text="{../../../../../Title}" />
-				<Border CornerRadius="6" BorderWidth="1" BorderColor="Transparent"  Height="12" Width="12"
-					MouseEnter="{BorderColor=White}" MouseLeave="{BorderColor=Transparent}">
+				<Border CornerRadius="6" BorderWidth="1" Foreground="Transparent"  Height="12" Width="12"
+					MouseEnter="{Foreground=White}" MouseLeave="{Foreground=Transparent}">
 					<Image Focusable="true" Name="Image" Margin="0" Width="0" Height="0" Path="#Crow.Images.Icons.exit2.svg"
 						 MouseClick="../../../../../../butQuitPress"/>
 				</Border>
diff --git a/Tests/GOLIBTest_4.cs b/Tests/GOLIBTest_4.cs
index df6b44f2..426ee388 100644
--- a/Tests/GOLIBTest_4.cs
+++ b/Tests/GOLIBTest_4.cs
@@ -137,14 +137,14 @@ namespace test
 					CornerRadius = 5,
 					Background = col,
 					BorderWidth = 2,
-					BorderColor = Color.Transparent,
+					Foreground = Color.Transparent,
 					Focusable = true
 				};
 				b.MouseEnter += delegate(object sender, MouseMoveEventArgs ee) {
-					(sender as Border).BorderColor = Color.White;
+					(sender as Border).Foreground = Color.White;
 				};
 				b.MouseLeave += delegate(object sender, MouseMoveEventArgs ee) {
-					(sender as Border).BorderColor = Color.Transparent;
+					(sender as Border).Foreground = Color.Transparent;
 				};
 				s.addChild (b);
 
@@ -186,14 +186,14 @@ namespace test
 				CornerRadius = 5,
 				Background = col,
 				BorderWidth = 2,
-				BorderColor = Color.Transparent,
+				Foreground = Color.Transparent,
 				Focusable = true
 			};
 			b.MouseEnter += delegate(object sender, MouseMoveEventArgs ee) {
-				(sender as Border).BorderColor = Color.White;
+				(sender as Border).Foreground = Color.White;
 			};
 			b.MouseLeave += delegate(object sender, MouseMoveEventArgs ee) {
-				(sender as Border).BorderColor = Color.Transparent;
+				(sender as Border).Foreground = Color.Transparent;
 			};
 			s.addChild (b);
 
diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs
index 23de6cf0..2006c35c 100644
--- a/Tests/GOLIBTests.cs
+++ b/Tests/GOLIBTests.cs
@@ -36,6 +36,11 @@ namespace test
 		int frameCpt = 0;
 		int idx = 0;
 		string[] testFiles = {
+			"testTextBox.crow",
+			"testSpinner.goml",
+			"testImage.crow",
+			"testButton.crow",
+			"fps.goml",
 			"test4.goml",
 			"testScrollbar.goml",
 			"2.crow",
@@ -48,7 +53,6 @@ namespace test
 			"testExpandable.goml",
 			"testCheckbox.goml",
 			"testPopper.goml",
-			"fps.goml",
 			"testLabel.goml",
 			"testAll.goml",
 //			"testSpinner.goml",
@@ -56,7 +60,6 @@ namespace test
 			"testContainer.goml",
 			"testBorder.goml",
 			"testRadioButton.goml",
-			"testSpinner.goml",
 			"testMsgBox.goml",
 			"testGrid.goml",
 			"testMeter.goml",
@@ -85,6 +88,8 @@ namespace test
 				ValueChanged.Raise(this, new ValueChangeEventArgs ("fps", _fps));
 				ValueChanged.Raise (this, new ValueChangeEventArgs ("update",
 					this.updateTime.ElapsedMilliseconds.ToString () + " ms"));
+				ValueChanged.Raise (this, new ValueChangeEventArgs ("drawing",
+					this.drawingTime.ElapsedMilliseconds.ToString () + " ms"));
 			}
 		}
 
@@ -98,6 +103,7 @@ namespace test
 			_fps = 0;
 		}
 		public string update = "";
+		public string drawing = "";
 		#endregion
 
 		public int intValue = 25;
@@ -147,17 +153,21 @@ namespace test
 		}
 		protected override void OnKeyDown (KeyboardKeyEventArgs e)
 		{
-//			if (FocusedWidget != null) {
-//				base.OnKeyDown (e);
-//				return;
-//			}
+			if (FocusedWidget is TextBox) {
+				base.OnKeyDown (e);
+				return;
+			}
 			if (e.Key == Key.Escape) {
 				this.Quit ();
 				return;
-			}else if (e.Key == Key.L) {
+			} else if (e.Key == Key.L) {
 				TestList.Add ("new string");
 				NotifyValueChanged ("TestList", TestList);
 				return;
+			} else if (e.Key == Key.W) {
+				GraphicObject w = LoadInterface("Interfaces/testWindow.goml");
+				w.DataSource = this;
+				return;
 			}
 			ClearInterface ();
 			idx++;
@@ -168,7 +178,10 @@ namespace test
 			obj.DataSource = this;
 
 		}
-
+		void onButClick(object send, MouseButtonEventArgs e)
+		{
+			Console.WriteLine ("button clicked:" + send.ToString());
+		}
 		[STAThread]
 		static void Main ()
 		{
diff --git a/Tests/Interfaces/test4.1.goml b/Tests/Interfaces/test4.1.goml
index bf8dd688..bce87300 100755
--- a/Tests/Interfaces/test4.1.goml
+++ b/Tests/Interfaces/test4.1.goml
@@ -4,10 +4,10 @@
 	Background="0,5;0,5;0,5;0,5" Foreground="White"
 	Margin="10" >
 	<Border 
-		BorderWidth="2" BorderColor="Transparent"
+		BorderWidth="2" Foreground="Transparent"
 		Focusable="True"
-		MouseEnter="{BorderColor = White}"
-		MouseLeave="{BorderColor = Transparent}">
+		MouseEnter="{Foreground = White}"
+		MouseLeave="{Foreground = Transparent}">
 
 		<HorizontalStack Name="hs0" Fit="true"
 			WidgetSpacing="10" 
@@ -21,7 +21,7 @@
 						Width="100" Height="20"
 						Value="50"
 						Foreground="BlueCrayola" Background="DarkGray"
-						BorderWidth="2" BorderColor="White"/>
+						BorderWidth="2" Foreground="White"/>
 <!--					<Label Name="labPb"
 						Width="20"
 						TextAlignment="RightCenter"/>
@@ -46,10 +46,10 @@
 				</Button>
 				<TextBoxWidget 	TextAlignment="LeftCenter" Font="droid,14"						
 								Width="300" Height="-1" Margin="2"
-								BorderColor="White" BorderWidth="1"
+								Foreground="White" BorderWidth="1"
 								Text="editable text"/>
 				<GroupBox Title="Group Box" Width="300" Height="100" 
-					BorderColor="White" BorderWidth="2" Margin="3">
+					Foreground="White" BorderWidth="2" Margin="3">
 					<Label Name="labValue" FontSize="14" Text="000"	TextAlignment="Center"/>
 				</GroupBox>
 				<Slider Height="10" Width="300" BorderWidth="1" Background="Transparent" />
@@ -84,7 +84,7 @@
 				 Margin="5" VerticalScrolling="true">
 				<VerticalStack Name="colors" VerticalAlignment="Top" Margin="5">
 					<ProgressBar Name="pbBar2" Width="100" Height="20" Value="50"
-								BorderWidth="2" BorderColor="White" Foreground="BlueCrayola" Background="DarkGray"/>
+								BorderWidth="2" Foreground="White" Foreground="BlueCrayola" Background="DarkGray"/>
 				</VerticalStack>
 			</Scroller>-->
 
diff --git a/Tests/Interfaces/test4.goml b/Tests/Interfaces/test4.goml
index 0e7bfda2..9f8f66a6 100755
--- a/Tests/Interfaces/test4.goml
+++ b/Tests/Interfaces/test4.goml
@@ -5,10 +5,10 @@
 	Margin="10" >
 	<Border Margin="10" CornerRadius="10"
 		Name="mainBorder"
-		BorderWidth="2" BorderColor="Transparent"
+		BorderWidth="2" Foreground="Transparent"
 		Focusable="True"
-		MouseEnter="{BorderColor = White}"
-		MouseLeave="{BorderColor = Transparent}">
+		MouseEnter="{Foreground = White}"
+		MouseLeave="{Foreground = Transparent}">
 		<HorizontalStack WidgetSpacing="1">
 			<VerticalStack Width="-1">
 				<HorizontalStack WidgetSpacing="1" Fit="true">
@@ -41,7 +41,7 @@
 				<TextBox Name="textbox1" TextAlignment="LeftCenter" Font="droid,14"						
 								Width="200" Height="-1" Margin="2" Background="White"
 								Forground="Black"
-								BorderColor="DimGray" BorderWidth="1"
+								Foreground="DimGray" BorderWidth="1"
 								Text="editable text"/>
 				<Popper Width="100">
 					<Border Fit="True" Background="ArmyGreen">
@@ -104,9 +104,9 @@
 					 Margin="5" VerticalScrolling="true" ScrollY="{../scrollbar1.Scroll}">
 					<VerticalStack Name="colors" VerticalAlignment="Top" Margin="1" Fit="true">
 <!--						<ProgressBar Name="pbBar2" Width="100" Height="20" Value="50"
-									BorderWidth="2" BorderColor="White" Foreground="BlueCrayola" Background="DarkGray"/>
+									BorderWidth="2" Foreground="White" Foreground="BlueCrayola" Background="DarkGray"/>
 						<ProgressBar Width="100" Height="20" Value="{fps}" BorderWidth="2"
-							BorderColor="White" Foreground="BlueCrayola" Background="DarkGray"/>												-->
+							Foreground="White" Foreground="BlueCrayola" Background="DarkGray"/>												-->
 					</VerticalStack>
 				</Scroller>
 				<ScrollBar Name="scrollbar1" Scroll="{../scroller1.ScrollY}" MaximumScroll="{../scroller1.MaximumScroll}"
@@ -131,7 +131,7 @@
 						Maximum="200"
 						Value="{fps}"
 						Foreground="BlueCrayola" Background="DarkGray"
-						BorderWidth="2" BorderColor="White"/>
+						BorderWidth="2" Foreground="White"/>
 				</HorizontalStack>
 
 				<Button  Margin="5" BorderWidth="0" Width="-1" Height="-1"  HorizontalAlignment="Center">
@@ -139,7 +139,7 @@
 				</Button>
 
 				<GroupBox Title="Group Box" Width="300" Height="100" 
-					BorderColor="White" BorderWidth="2" Margin="3">
+					Foreground="White" BorderWidth="2" Margin="3">
 					<Label Name="labValue" FontSize="14" Text="{../../slider.Value}" TextAlignment="Center"/>
 				</GroupBox>
 				<Slider Height="10" Width="300" BorderWidth="1" Background="Transparent" />
@@ -151,9 +151,9 @@
 					 Margin="5" VerticalScrolling="true" ScrollY="{../scrollbar1.Scroll}">
 					<VerticalStack Name="colors" VerticalAlignment="Top" Margin="1">
 						<ProgressBar Name="pbBar2" Width="100" Height="20" Value="50"
-									BorderWidth="2" BorderColor="White" Foreground="BlueCrayola" Background="DarkGray"/>
+									BorderWidth="2" Foreground="White" Foreground="BlueCrayola" Background="DarkGray"/>
 						<ProgressBar Width="100" Height="20" Value="{fps}" BorderWidth="2"
-							BorderColor="White" Foreground="BlueCrayola" Background="DarkGray"/>												
+							Foreground="White" Foreground="BlueCrayola" Background="DarkGray"/>												
 					</VerticalStack>
 				</Scroller>
 				<Scrollbar Name="scrollbar1" Scroll="{../scroller1.ScrollY}" MaximumScroll="{../scroller1.MaximumScroll}"
diff --git a/Tests/Interfaces/test5.goml b/Tests/Interfaces/test5.goml
index 2d23d8ea..0526b8ad 100755
--- a/Tests/Interfaces/test5.goml
+++ b/Tests/Interfaces/test5.goml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Container Name="container0" BorderColor="White" BorderWidth="2" Margin="100"
+<Container Name="container0" Foreground="White" BorderWidth="2" Margin="100"
 			CornerRadius="50">
 	<Group Name="group0" Background="Green" Margin="20">
 		<HorizontalStack Name="hs0" Background="Blue" Margin="20">
@@ -20,7 +20,7 @@
 	</Group>
 <!--	<Scroller Height="100" Width="300" Background="Green" VerticalScrolling="true" Margin="5">
 		<Group Name="MainGrp" Background="Red" VerticalAlignment="Top"
-			 BorderColor="White" BorderWidth="2" Margin="10" Focusable="True" 
+			 Foreground="White" BorderWidth="2" Margin="10" Focusable="True" 
 			 Width="400" Height="200">
 			 <HorizontalStack>
 				<Button Width="-1" Height="-1" Margin="5" BorderWidth="2" Background="Gray">
diff --git a/Tests/Interfaces/test6.goml b/Tests/Interfaces/test6.goml
index d9edd565..2108226d 100755
--- a/Tests/Interfaces/test6.goml
+++ b/Tests/Interfaces/test6.goml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
-<Border BorderWidth="1" BorderColor="White" CornerRadius="10" Width="500" Height="300">
+<Border BorderWidth="1" Foreground="White" CornerRadius="10" Width="500" Height="300">
 	<VerticalStack Height="0" Background="0,4;0,4;0,4;0,4">
-		<Border BorderWidth="1" BorderColor="White"  Height="20" Background="0,1;0,5;1,0;0,5">
+		<Border BorderWidth="1" Foreground="White"  Height="20" Background="0,1;0,5;1,0;0,5">
 			<HorizontalStack Name="hs" Margin="1" Spacing="1" Height="-1" >
 				<GraphicObject Width="5"/>
 				<Image Name="Image" Margin="1" Width="12" Height="12" Path="#go.Images.Icons.tetra.png"/>
 				<Label Foreground="White" Width="0" Name="Title" Margin="1" TextAlignment="Center" />
-				<Border CornerRadius="6" BorderWidth="1" Margin="0" BorderColor="Transparent"  Height="12" Width="12"
-					MouseEnter="{BorderColor=White}" MouseLeave="{BorderColor=Transparent}">
+				<Border CornerRadius="6" BorderWidth="1" Margin="0" Foreground="Transparent"  Height="12" Width="12"
+					MouseEnter="{Foreground=White}" MouseLeave="{Foreground=Transparent}">
 					<Image Focusable="true" Name="Image" Margin="0" Width="0" Height="0" 
 					Path="#go.Images.Icons.exit2.svg"/>
 				</Border>
diff --git a/Tests/Interfaces/testButton.crow b/Tests/Interfaces/testButton.crow
new file mode 100755
index 00000000..5e4c5a5c
--- /dev/null
+++ b/Tests/Interfaces/testButton.crow
@@ -0,0 +1,322 @@
+<?xml version="1.0"?>
+<VerticalStack Fit="true">
+	<HorizontalStack Fit="True">
+		<Button Caption="but" MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+</VerticalStack>
\ No newline at end of file
diff --git a/Tests/Interfaces/testImage.crow b/Tests/Interfaces/testImage.crow
new file mode 100755
index 00000000..8a055551
--- /dev/null
+++ b/Tests/Interfaces/testImage.crow
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<VerticalStack Fit="true">
+	<HorizontalStack Fit="true" Background="Red" Margin="5">
+		<Label Text="SCALED PROPORTIONNAL" Width="150"/>
+		<Image Background="Blue" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Margin="10" Background="Blue" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Background="Blue" Width="20" Height="20" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Margin="2" Background="Blue" Width="20" Height="20" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Margin="10" Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Margin="10" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Background="Blue" Width="50" Height="-1" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Margin="10" Background="Blue" Width="50" Height="-1" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="true" Background="Red" Margin="5">
+		<Label Text="SCALED NOT PROPORTIONNAL" Width="150"/>
+		<Image KeepProportions="false" Background="Blue" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image KeepProportions="false" Margin="10" Background="Blue" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image KeepProportions="false" Background="Blue" Width="20" Height="20" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image KeepProportions="false" Margin="2" Background="Blue" Width="20" Height="20" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image KeepProportions="false" Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image KeepProportions="false" Margin="10" Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image KeepProportions="false" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image KeepProportions="false" Margin="10" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image KeepProportions="false" Background="Blue" Width="50" Height="-1" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image KeepProportions="false" Margin="10" Background="Blue" Width="50" Height="-1" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="true" Background="Red" Margin="5">
+		<Label Text="UNSCALED" Width="150"/>
+		<Image Scaled="false" Background="Blue" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Scaled="false" Margin="10" Background="Blue" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Scaled="false" Background="Blue" Width="20" Height="20" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Scaled="false" Margin="2" Background="Blue" Width="20" Height="20" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Scaled="false" Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Scaled="false" Margin="10" Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Scaled="false" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Scaled="false" Margin="10" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Scaled="false" Background="Blue" Width="50" Height="-1" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Scaled="false" Margin="10" Background="Blue" Width="50" Height="-1" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="true" Background="Red" Margin="5">
+		<Label Text="SCALED PROPORTIONNAL" Width="150"/>
+		<Image Background="Blue" Path="#Tests.image.tetra.png"/>
+		<Image Margin="10" Background="Blue" Path="#Tests.image.tetra.png"/>
+		<Image Background="Blue" Width="20" Height="20" Path="#Tests.image.tetra.png"/>
+		<Image Margin="2" Background="Blue" Width="20" Height="20" Path="#Tests.image.tetra.png"/>
+		<Image Background="Blue" Width="50" Height="100" Path="#Tests.image.tetra.png"/>
+		<Image Margin="10" Background="Blue" Width="50" Height="100" Path="#Tests.image.tetra.png"/>
+		<Image Background="Blue" Width="100" Height="50" Path="#Tests.image.tetra.png"/>
+		<Image Margin="10" Background="Blue" Width="100" Height="50" Path="#Tests.image.tetra.png"/>
+		<Image Background="Blue" Width="50" Height="-1" Path="#Tests.image.tetra.png"/>
+		<Image Margin="10" Background="Blue" Width="50" Height="-1" Path="#Tests.image.tetra.png"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="true" Background="Red" Margin="5">
+		<Label Text="SCALED NOT PROPORTIONNAL" Width="150"/>
+		<Image KeepProportions="false" Background="Blue" Path="#Tests.image.tetra.png"/>
+		<Image KeepProportions="false" Margin="10" Background="Blue" Path="#Tests.image.tetra.png"/>
+		<Image KeepProportions="false" Background="Blue" Width="20" Height="20" Path="#Tests.image.tetra.png"/>
+		<Image KeepProportions="false" Margin="2" Background="Blue" Width="20" Height="20" Path="#Tests.image.tetra.png"/>
+		<Image KeepProportions="false" Background="Blue" Width="50" Height="100" Path="#Tests.image.tetra.png"/>
+		<Image KeepProportions="false" Margin="10" Background="Blue" Width="50" Height="100" Path="#Tests.image.tetra.png"/>
+		<Image KeepProportions="false" Background="Blue" Width="100" Height="50" Path="#Tests.image.tetra.png"/>
+		<Image KeepProportions="false" Margin="10" Background="Blue" Width="100" Height="50" Path="#Tests.image.tetra.png"/>
+		<Image KeepProportions="false" Background="Blue" Width="50" Height="-1" Path="#Tests.image.tetra.png"/>
+		<Image KeepProportions="false" Margin="10" Background="Blue" Width="50" Height="-1" Path="#Tests.image.tetra.png"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="true" Background="Red" Margin="5">
+		<Label Text="UNSCALED" Width="150"/>
+		<Image Scaled="false" Background="Blue" Path="#Tests.image.tetra.png"/>
+		<Image Scaled="false" Margin="10" Background="Blue" Path="#Tests.image.tetra.png"/>
+		<Image Scaled="false" Background="Blue" Width="20" Height="20" Path="#Tests.image.tetra.png"/>
+		<Image Scaled="false" Margin="2" Background="Blue" Width="20" Height="20" Path="#Tests.image.tetra.png"/>
+		<Image Scaled="false" Background="Blue" Width="50" Height="100" Path="#Tests.image.tetra.png"/>
+		<Image Scaled="false" Margin="10" Background="Blue" Width="50" Height="100" Path="#Tests.image.tetra.png"/>
+		<Image Scaled="false" Background="Blue" Width="100" Height="50" Path="#Tests.image.tetra.png"/>
+		<Image Scaled="false" Margin="10" Background="Blue" Width="100" Height="50" Path="#Tests.image.tetra.png"/>
+		<Image Scaled="false" Background="Blue" Width="50" Height="-1" Path="#Tests.image.tetra.png"/>
+		<Image Scaled="false" Margin="10" Background="Blue" Width="50" Height="-1" Path="#Tests.image.tetra.png"/>
+	</HorizontalStack>
+	<HorizontalStack Width="-1" Height="100" Background="Red" Margin="5">
+		<Image Background="Blue" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Margin="10" Background="White" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Background="White" Width="20" Height="10" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Margin="1" Background="White" Width="20" Height="10" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+	</HorizontalStack>
+</VerticalStack>
\ No newline at end of file
diff --git a/Tests/Interfaces/testTextBox.crow b/Tests/Interfaces/testTextBox.crow
new file mode 100755
index 00000000..9e628099
--- /dev/null
+++ b/Tests/Interfaces/testTextBox.crow
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<VerticalStack Background="Red" Width="-1" Height="-1">	
+	<TextBox Name="tb" Multiline="true" Font="droid,16" Margin="5" Text="A\nBB\nCCC\nDDDD"/>
+	<TextBox Multiline="true" Font="droid,16" Name="tb5" Margin="5" Text="{../tb.SelectedText}"/>
+<!--	<TextBox Font="droid,10" Name="tb1" Margin="5" Text="this is a test of a text box"/>
+	<TextBox Width="300" Height="35" Text="this is a test of a text box"/>-->
+	<TextBox Font="droid,10" Name="tb2" Margin="0" Text="this is a test of a text box"/>
+	<TextBox Font="droid,10" Name="tb3" Margin="5" Text="this is a test of a text box"/>
+	<TextBox Font="droid,10" Name="tb4" Margin="5" Text="this is a test of a text box"/>
+	<TextBox Font="droid,10" Name="tb5" Margin="20" Text="this is a test of a text box"/>
+	<TextBox Multiline="true" Font="droid,10" Name="tb6" Margin="5" Text="this is a test of a text box\nthis is a test of a text box"/>
+	<TextBox Multiline="true" Font="droid,10" Name="tb7" Margin="1" TextAlignment="Center"
+		Text="this is a test of a text box\nthis is a test\nthis is a test when line are centered"/>
+	<TextBox Multiline="true" Font="droid,10" Name="tb8" Margin="1" TextAlignment="Center"
+		Text="this is a test of a text box\n\n\nthis is a test\nthis is a test when line are centered"/>
+</VerticalStack>
\ No newline at end of file
diff --git a/Tests/Interfaces/testWindow.goml b/Tests/Interfaces/testWindow.goml
index 4e497fff..09bfb1ae 100755
--- a/Tests/Interfaces/testWindow.goml
+++ b/Tests/Interfaces/testWindow.goml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Window Left="10" Top="10" Title="Test window" 
-		Width="250" Height="300" >
-	<VerticalStack Name="contentVSStack" Margin="10" Spacing="10">
+		Width="250" Height="550" >
+	<VerticalStack Name="contentVSStack" Margin="10" Spacing="10" Background="0,4;0,4;0,4;0,4">
 		<Slider Name="slider" Height="10" Width="0"/>
 		<GroupBox Caption="test"  Height="-1" Width="-1" Margin="5">
 			<VerticalStack  Height="-1" Width="0" >
@@ -15,7 +15,33 @@
 			<GraphicObject Width="0"/>
 			<CheckBox Height="-1" Width="80" IsChecked="true"/>
 		</HorizontalStack>
-
+<Border Fit="true" CornerRadius="5" BorderWidth="1">
+	<Container Name="MainGrp" Background="0,5;0,5;0,5;0,4" Width="120" Fit="true"
+		Margin="10" Focusable="True" >
+			<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
+				<HorizontalStack Fit="true">
+					<Label Text="Update:" Width="50" TextAlignment="RightCenter"/>
+					<Label Name="labUpdate" Text="{update}" Font="droid,12" Background="AoEnglish" Width="50" TextAlignment="Center"/>
+				</HorizontalStack>
+				<HorizontalStack Fit="true">
+					<Label Text="Drawing:" Width="50" TextAlignment="RightCenter"/>
+					<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Background="AoEnglish" Width="50" TextAlignment="Center"/>
+				</HorizontalStack>
+				<HorizontalStack Fit="true">
+					<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="RightCenter"/>
+					<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" Background="AoEnglish"/>
+				</HorizontalStack>
+				<HorizontalStack Fit="true">
+					<Label Text="Min:" Width="50" TextAlignment="RightCenter"/>
+					<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center" Background="AoEnglish"/>
+				</HorizontalStack>
+				<HorizontalStack Fit="true">
+					<Label Text="Max:" Width="50" TextAlignment="RightCenter"/>
+					<Label Text="{fpsMax}" Font="droid , 12" Background="AoEnglish" Width="50" TextAlignment="Center"/>
+				</HorizontalStack>
+			</VerticalStack>				
+	</Container>
+</Border>
 <!--		<Checkbox Height="-1" Width="-1" Background="Red" Margin="0" VerticalAlignment="Center" HorizontalAlignment="Right"/>-->
 	</VerticalStack>
 </Window>
diff --git a/Tests/Interfaces/testWindow2.goml b/Tests/Interfaces/testWindow2.goml
index 235f0806..fd070bb5 100755
--- a/Tests/Interfaces/testWindow2.goml
+++ b/Tests/Interfaces/testWindow2.goml
@@ -2,16 +2,16 @@
 <Window Name="window1" Left="10" Top="10" Title="Test window" Width="200" Height="200" Background="0,5;0,5;0,5;0,8" 
 	Focusable="True"  CornerRadius="20" MinimumSize="100;100" MaximumSize="500;500">
 	<Template>
-		<Border BorderWidth="1" BorderColor="White" CornerRadius="20" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">
+		<Border BorderWidth="1" Foreground="White" CornerRadius="20" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">
 			<VerticalStack Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}">
-				<Border BorderWidth="1" BorderColor="White" Width="{../../../TemplatedWidth}" Height="-1" 
+				<Border BorderWidth="1" Foreground="White" Width="{../../../TemplatedWidth}" Height="-1" 
 						Background="0,1;0,5;1,0;0,5">
 					<HorizontalStack Name="hs" Margin="1" Spacing="1" Width="{../../../../TemplatedWidth}" Height="-1" >
 						<GraphicObject Width="5"/>
 						<Image Margin="1" Width="12" Height="12" Path="{../../../../../Icon}"/>
 						<Label Foreground="White" Width="{../../../../../TemplatedWidth}" Margin="1" TextAlignment="Center" Text="{../../../../../Title}" />
-						<Border CornerRadius="6" BorderWidth="1" BorderColor="Transparent"  Height="12" Width="12"
-							MouseEnter="{BorderColor=White}" MouseLeave="{BorderColor=Transparent}">
+						<Border CornerRadius="6" BorderWidth="1" Foreground="Transparent"  Height="12" Width="12"
+							MouseEnter="{Foreground=White}" MouseLeave="{Foreground=Transparent}">
 							<Image Focusable="true" Name="Image" Margin="0" Width="0" Height="0" Path="#Crow.Images.Icons.exit2.svg"
 								 MouseClick="../../../../../../butQuitPress"/>
 						</Border>
diff --git a/Tests/Interfaces/test_Listbox.goml b/Tests/Interfaces/test_Listbox.goml
index 4348439d..1cc3f630 100755
--- a/Tests/Interfaces/test_Listbox.goml
+++ b/Tests/Interfaces/test_Listbox.goml
@@ -4,7 +4,7 @@
 	<VerticalStack Fit="true" Margin="50">
 		<Label Text="{MousePos}" Width="-1" Background="DarkGreen"/>
 		<Label Text="{Hover}" Width="-1" Background="DarkGreen"/>
-		<Button Text="Clear" Width="150" MouseClick="OnClear"/>
+		<Button Caption="Clear" Width="150" MouseClick="OnClear"/>
 		<ListBox Data="{TestList}" Background="0,5;0,5;0,5;0,5"
 					 HorizontalAlignment="Center" Width="-1" Height="150" Margin="5">
 			<Template>
@@ -22,6 +22,6 @@
 				</Border>
 			</Template>
 		</ListBox>
-		<Button Text="Load list" Width="0" MouseClick="OnLoadList"/>
+		<Button Caption="Load list" Width="0" MouseClick="OnLoadList"/>
 	</VerticalStack>
 </Border>
\ No newline at end of file
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index e2b21afe..5919a9d4 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -58,9 +58,6 @@
     <Compile Include="..\bin\Debug\Interfaces\test_stack.goml.cs">
       <Link>Interfaces\test_stack.goml.cs</Link>
     </Compile>
-    <Compile Include="..\bin\Debug\Interfaces\test4.goml.cs">
-      <Link>Interfaces\test4.goml.cs</Link>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="image\u.svg">
@@ -196,6 +193,15 @@
     <None Include="Interfaces\1.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Interfaces\testButton.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\testImage.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\testTextBox.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Interfaces\" />
diff --git a/UnitTest/Interfaces/testButton.crow b/UnitTest/Interfaces/testButton.crow
new file mode 100755
index 00000000..5e4c5a5c
--- /dev/null
+++ b/UnitTest/Interfaces/testButton.crow
@@ -0,0 +1,322 @@
+<?xml version="1.0"?>
+<VerticalStack Fit="true">
+	<HorizontalStack Fit="True">
+		<Button Caption="but" MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="True">
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+		<Button MouseClick="onButClick"/>
+	</HorizontalStack>
+</VerticalStack>
\ No newline at end of file
diff --git a/UnitTest/Interfaces/testImage.crow b/UnitTest/Interfaces/testImage.crow
new file mode 100755
index 00000000..1939982e
--- /dev/null
+++ b/UnitTest/Interfaces/testImage.crow
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<VerticalStack Fit="true">
+	<HorizontalStack Fit="true" Background="Red" Margin="5">
+		<Label Text="SCALED PROPORTIONNAL" Width="150"/>
+		<Image Background="Blue" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Margin="10" Background="Blue" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Background="Blue" Width="20" Height="20" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Margin="2" Background="Blue" Width="20" Height="20" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Margin="10" Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Margin="10" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Background="Blue" Width="50" Height="-1" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Margin="10" Background="Blue" Width="50" Height="-1" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="true" Background="Red" Margin="5">
+		<Label Text="SCALED NOT PROPORTIONNAL" Width="150"/>
+		<Image KeepProportions="false" Background="Blue" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image KeepProportions="false" Margin="10" Background="Blue" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image KeepProportions="false" Background="Blue" Width="20" Height="20" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image KeepProportions="false" Margin="2" Background="Blue" Width="20" Height="20" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image KeepProportions="false" Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image KeepProportions="false" Margin="10" Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image KeepProportions="false" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image KeepProportions="false" Margin="10" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image KeepProportions="false" Background="Blue" Width="50" Height="-1" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image KeepProportions="false" Margin="10" Background="Blue" Width="50" Height="-1" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="true" Background="Red" Margin="5">
+		<Label Text="UNSCALED" Width="150"/>
+		<Image Scaled="false" Background="Blue" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Scaled="false" Margin="10" Background="Blue" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Scaled="false" Background="Blue" Width="20" Height="20" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Scaled="false" Margin="2" Background="Blue" Width="20" Height="20" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Scaled="false" Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Scaled="false" Margin="10" Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Scaled="false" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Scaled="false" Margin="10" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Scaled="false" Background="Blue" Width="50" Height="-1" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+		<Image Scaled="false" Margin="10" Background="Blue" Width="50" Height="-1" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="true" Background="Red" Margin="5">
+		<Label Text="SCALED PROPORTIONNAL" Width="150"/>
+		<Image Background="Blue" Path="#Tests.image.tetra.png"/>
+		<Image Margin="10" Background="Blue" Path="#Tests.image.tetra.png"/>
+		<Image Background="Blue" Width="20" Height="20" Path="#Tests.image.tetra.png"/>
+		<Image Margin="2" Background="Blue" Width="20" Height="20" Path="#Tests.image.tetra.png"/>
+		<Image Background="Blue" Width="50" Height="100" Path="#Tests.image.tetra.png"/>
+		<Image Margin="10" Background="Blue" Width="50" Height="100" Path="#Tests.image.tetra.png"/>
+		<Image Background="Blue" Width="100" Height="50" Path="#Tests.image.tetra.png"/>
+		<Image Margin="10" Background="Blue" Width="100" Height="50" Path="#Tests.image.tetra.png"/>
+		<Image Background="Blue" Width="50" Height="-1" Path="#Tests.image.tetra.png"/>
+		<Image Margin="10" Background="Blue" Width="50" Height="-1" Path="#Tests.image.tetra.png"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="true" Background="Red" Margin="5">
+		<Label Text="SCALED NOT PROPORTIONNAL" Width="150"/>
+		<Image KeepProportions="false" Background="Blue" Path="#Tests.image.tetra.png"/>
+		<Image KeepProportions="false" Margin="10" Background="Blue" Path="#Tests.image.tetra.png"/>
+		<Image KeepProportions="false" Background="Blue" Width="20" Height="20" Path="#Tests.image.tetra.png"/>
+		<Image KeepProportions="false" Margin="2" Background="Blue" Width="20" Height="20" Path="#Tests.image.tetra.png"/>
+		<Image KeepProportions="false" Background="Blue" Width="50" Height="100" Path="#Tests.image.tetra.png"/>
+		<Image KeepProportions="false" Margin="10" Background="Blue" Width="50" Height="100" Path="#Tests.image.tetra.png"/>
+		<Image KeepProportions="false" Background="Blue" Width="100" Height="50" Path="#Tests.image.tetra.png"/>
+		<Image KeepProportions="false" Margin="10" Background="Blue" Width="100" Height="50" Path="#Tests.image.tetra.png"/>
+		<Image KeepProportions="false" Background="Blue" Width="50" Height="-1" Path="#Tests.image.tetra.png"/>
+		<Image KeepProportions="false" Margin="10" Background="Blue" Width="50" Height="-1" Path="#Tests.image.tetra.png"/>
+	</HorizontalStack>
+	<HorizontalStack Fit="true" Background="Red" Margin="5">
+		<Label Text="UNSCALED" Width="150"/>
+		<Image Scaled="false" Background="Blue" Path="#Tests.image.tetra.png"/>
+		<Image Scaled="false" Margin="10" Background="Blue" Path="#Tests.image.tetra.png"/>
+		<Image Scaled="false" Background="Blue" Width="20" Height="20" Path="#Tests.image.tetra.png"/>
+		<Image Scaled="false" Margin="2" Background="Blue" Width="20" Height="20" Path="#Tests.image.tetra.png"/>
+		<Image Scaled="false" Background="Blue" Width="50" Height="100" Path="#Tests.image.tetra.png"/>
+		<Image Scaled="false" Margin="10" Background="Blue" Width="50" Height="100" Path="#Tests.image.tetra.png"/>
+		<Image Scaled="false" Background="Blue" Width="100" Height="50" Path="#Tests.image.tetra.png"/>
+		<Image Scaled="false" Margin="10" Background="Blue" Width="100" Height="50" Path="#Tests.image.tetra.png"/>
+		<Image Scaled="false" Background="Blue" Width="50" Height="-1" Path="#Tests.image.tetra.png"/>
+		<Image Scaled="false" Margin="10" Background="Blue" Width="50" Height="-1" Path="#Tests.image.tetra.png"/>
+	</HorizontalStack>
+</VerticalStack>
\ No newline at end of file
diff --git a/UnitTest/NUnitCrowWindow.cs b/UnitTest/NUnitCrowWindow.cs
index 0c73b8e7..5b5ede3f 100644
--- a/UnitTest/NUnitCrowWindow.cs
+++ b/UnitTest/NUnitCrowWindow.cs
@@ -301,7 +301,7 @@ namespace Crow
 		{
 			if (_activeWidget != null) {
 				//first, ensure object is still in the graphic tree
-				if (_activeWidget.TopContainer == null) {
+				if (_activeWidget.HostContainer == null) {
 					activeWidget = null;
 				} else {
 
@@ -313,7 +313,7 @@ namespace Crow
 
 			if (_hoverWidget != null) {
 				//first, ensure object is still in the graphic tree
-				if (_hoverWidget.TopContainer == null) {
+				if (_hoverWidget.HostContainer == null) {
 					hoverWidget = null;
 				} else {
 					//check topmost graphicobject first
@@ -374,7 +374,7 @@ namespace Crow
 				return;
 			}
 
-			_activeWidget.onMouseButtonUp (this, e);
+			_activeWidget.onMouseUp (this, e);
 			_activeWidget = null;
 		}
 		void Mouse_ButtonDown(object sender, MouseButtonEventArgs e)
@@ -393,7 +393,7 @@ namespace Crow
 			}
 
 			_activeWidget = g;
-			_activeWidget.onMouseButtonDown (this, e);
+			_activeWidget.onMouseDown (this, e);
 		}
 
 		void Mouse_WheelChanged(object sender, MouseWheelEventArgs e)
@@ -439,7 +439,7 @@ namespace Crow
 		Rectangle ILayoutable.ClientRectangle {
 			get { return new Size(this.ClientRectangle.Size.Width,this.ClientRectangle.Size.Height); }
 		}
-		public IGOLibHost TopContainer {
+		public IGOLibHost HostContainer {
 			get { return this; }
 		}
 
diff --git a/UnitTest/UnitTest.csproj b/UnitTest/UnitTest.csproj
index ddd53b61..4ffa61a2 100644
--- a/UnitTest/UnitTest.csproj
+++ b/UnitTest/UnitTest.csproj
@@ -10,6 +10,7 @@
     <RootNamespace>UnitTest</RootNamespace>
     <AssemblyName>UnitTest</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <ReleaseVersion>0.2</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -64,6 +65,12 @@
     <None Include="Interfaces\2.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Interfaces\testButton.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\testImage.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Crow.csproj">
diff --git a/src/BmpPicture.cs b/src/BmpPicture.cs
index 65901694..879329aa 100644
--- a/src/BmpPicture.cs
+++ b/src/BmpPicture.cs
@@ -66,30 +66,27 @@ namespace Crow
 			float widthRatio = 1f;
 			float heightRatio = 1f;
 
-			if (Scale){
+			if (Scaled){
 				widthRatio = (float)rect.Width / Dimensions.Width;
 				heightRatio = (float)rect.Height / Dimensions.Height;
 			}
 
-			float ratio = Math.Min (widthRatio, heightRatio);
-
-//			if (KeepProportions)
-//				widthRatio = heightRatio = ratio;
+			if (KeepProportions) {
+				if (widthRatio < heightRatio)
+					heightRatio = widthRatio;
+				else
+					widthRatio = heightRatio;
+			}
 
-			Rectangle rImg = rect;
 			gr.Save ();
 
-			if (KeepProportions) {
-				gr.Translate ((rect.Width - (float)Dimensions.Width * ratio)/2f, 
-					(rect.Height - (float)Dimensions.Height * ratio)/2f);
-				gr.Scale (ratio, ratio);
-					
-			}else
-				gr.Scale (widthRatio, heightRatio);
+			gr.Translate (rect.Left,rect.Top);
+			gr.Scale (widthRatio, heightRatio);
+			gr.Translate ((rect.Width/widthRatio - Dimensions.Width)/2, (rect.Height/heightRatio - Dimensions.Height)/2);
 			
 			using (ImageSurface imgSurf = new ImageSurface (image, Format.Argb32, 
 				Dimensions.Width, Dimensions.Height, 4 * Dimensions.Width)) {
-				gr.SetSourceSurface (imgSurf, (int)(rImg.X / widthRatio), (int)(rImg.Y / heightRatio));
+				gr.SetSourceSurface (imgSurf, 0,0);
 				gr.Paint ();
 			}
 			gr.Restore ();
diff --git a/src/BubblingMouseButtonEventArgs.cs b/src/BubblingMouseButtonEventArgs.cs
new file mode 100644
index 00000000..863d265e
--- /dev/null
+++ b/src/BubblingMouseButtonEventArgs.cs
@@ -0,0 +1,14 @@
+using System;
+using OpenTK.Input;
+
+namespace Crow
+{
+	public class BubblingMouseButtonEventArg: MouseButtonEventArgs
+	{
+		public GraphicObject Focused;
+		public BubblingMouseButtonEventArg(MouseButtonEventArgs mbe) : base(mbe){
+			
+		}
+	}
+}
+
diff --git a/src/CompilerServices/CompilerServices.cs b/src/CompilerServices/CompilerServices.cs
index 20856794..25d66f4b 100644
--- a/src/CompilerServices/CompilerServices.cs
+++ b/src/CompilerServices/CompilerServices.cs
@@ -96,7 +96,7 @@ namespace Crow
 				ILayoutable tmp = Source.Instance as ILayoutable;
 				if (string.IsNullOrEmpty (bindingExp [0])) {
 					//if exp start with '/' => Graphic tree parsing start at top container
-					tmp = tmp.TopContainer as ILayoutable;
+					tmp = tmp.HostContainer as ILayoutable;
 					ptr++;
 				}
 				while (ptr < bindingExp.Length - 1) {
diff --git a/src/GraphicObjects/Border.cs b/src/GraphicObjects/Border.cs
index f412268c..d9791050 100644
--- a/src/GraphicObjects/Border.cs
+++ b/src/GraphicObjects/Border.cs
@@ -12,7 +12,6 @@ namespace Crow
 		#endregion
 
 		#region private fields
-		Color _borderColor;
 		int _borderWidth;
 		#endregion
 
@@ -26,12 +25,9 @@ namespace Crow
 			}
 		}
 		[XmlAttributeAttribute()][DefaultValue("White")]
-		public virtual Color BorderColor {
-			get { return _borderColor; }
-			set {
-				_borderColor = value;
-				registerForGraphicUpdate ();
-			}
+		public override Color Foreground {
+			get { return base.Foreground;}
+			set {base.Foreground = value;}
 		}
 		#endregion
 
@@ -62,7 +58,7 @@ namespace Crow
 
 			if (BorderWidth > 0) {
 				gr.LineWidth = BorderWidth;
-				gr.Color = BorderColor;
+				gr.Color = Foreground;
 				CairoHelpers.CairoRectangle(gr, rBack, CornerRadius);
 				gr.Stroke ();
 			}
diff --git a/src/GraphicObjects/Button.cs b/src/GraphicObjects/Button.cs
index 5d3e81ca..17fbe328 100644
--- a/src/GraphicObjects/Button.cs
+++ b/src/GraphicObjects/Button.cs
@@ -13,71 +13,93 @@ using System.ComponentModel;
 
 namespace Crow
 {
-    public class Button : Container, IXmlSerializable
+	[DefaultTemplate("#Crow.Templates.Button.crow")]
+    public class Button : TemplatedContainer
     {
 		#region CTOR
         public Button() : base()
         {
 			//MouseEnter += delegate { Background = Color.RedDevil;};
 			//MouseLeave += delegate { Background = Color.Transparent;};
-			MouseButtonDown += delegate { BackImgSub = "pressed"; registerForGraphicUpdate();};
-			MouseButtonUp += delegate { BackImgSub = "normal";registerForGraphicUpdate();};
+//			MouseButtonDown += delegate { BackImgSub = "pressed"; registerForGraphicUpdate();};
+//			MouseButtonUp += delegate { BackImgSub = "normal";registerForGraphicUpdate();};
 		}
 		#endregion
 
-		#region GraphicObject Overrides
-		[XmlAttributeAttribute()][DefaultValue(50)]
-		public override int Width {
-			get { return base.Width; }
-			set { base.Width = value; }
-		}
-		[XmlAttributeAttribute()][DefaultValue(20)]
-		public override int Height {
-			get { return base.Height; }
-			set { base.Height = value; }
+		string caption;
+		string image;
+		Container _contentContainer;
+
+		public override GraphicObject Content {
+			get {
+				return _contentContainer == null ? null : _contentContainer.Child;
+			}
+			set {
+				if (_contentContainer != null)					
+					_contentContainer.SetChild(value);
+			}
 		}
-		[XmlAttributeAttribute()][DefaultValue("Transparent")]
-		public override Color Background {
-			get { return base.Background; }
-			set { base.Background = value; }
+		protected override void loadTemplate(GraphicObject template = null)
+		{
+			base.loadTemplate (template);
+
+			_contentContainer = this.child.FindByName ("Content") as Container;
 		}
+
+		#region GraphicObject Overrides
+//		[XmlAttributeAttribute()][DefaultValue(50)]
+//		public override int Width {
+//			get { return base.Width; }
+//			set { base.Width = value; }
+//		}
+//		[XmlAttributeAttribute()][DefaultValue(20)]
+//		public override int Height {
+//			get { return base.Height; }
+//			set { base.Height = value; }
+//		}
 		[XmlAttributeAttribute()][DefaultValue(true)]
         public override bool Focusable
         {
             get { return base.Focusable; }
             set { base.Focusable = value; }
 		}
-		[XmlAttributeAttribute()][DefaultValue("#Crow.Images.button.svg")]
-		public override Picture BackgroundImage {
-			get {
-				return base.BackgroundImage;
-			}
-			set {
-				base.BackgroundImage = value;
-				BackImgSub = "normal";
-			}
+		public override void ResolveBindings ()
+		{
+			base.ResolveBindings ();
+			if (Content != null)
+				Content.ResolveBindings ();
+		}
+		public override void onMouseDown (object sender, MouseButtonEventArgs e)
+		{
+			base.onMouseDown (sender, e);
+			NotifyValueChanged ("State", "pressed");
+		}
+		public override void onMouseUp (object sender, MouseButtonEventArgs e)
+		{
+			base.onMouseUp (sender, e);
+			NotifyValueChanged ("State", "normal");
 		}
 		#endregion
 
-		[XmlAttributeAttribute][DefaultValue("Button")]
-		public string Text
-		{
-			get {
-				Label l = Child as Label;
-				return l == null ? "" : l.Text; 
+		[XmlAttributeAttribute()][DefaultValue("Button")]
+		public string Caption {
+			get { return caption; } 
+			set {
+				if (caption == value)
+					return;
+				caption = value; 
+				NotifyValueChanged ("Caption", caption);
 			}
-			set
-			{
-				Label l = Child as Label;
-				if (l == null)
-					this.SetChild(new Label (value) 
-						{ 
-							TextAlignment = Alignment.Center,
-							Foreground = Color.Black
-						});
-				else
-					l.Text = value;
+		}        
+		[XmlAttributeAttribute()][DefaultValue("#Crow.Images.button.svg")]
+		public string Image {
+			get { return image; } 
+			set {
+				if (image == value)
+					return;
+				image = value; 
+				NotifyValueChanged ("Image", image);
 			}
-		}       
+		}     
 	}
 }
diff --git a/src/GraphicObjects/ComboBox.cs b/src/GraphicObjects/ComboBox.cs
index 5d9c8e97..b958a81b 100644
--- a/src/GraphicObjects/ComboBox.cs
+++ b/src/GraphicObjects/ComboBox.cs
@@ -316,7 +316,7 @@ namespace Crow
 			
 		public virtual void onPop(object sender, EventArgs e)
 		{
-			IGOLibHost tc = TopContainer;
+			IGOLibHost tc = HostContainer;
 			if (tc == null)
 				return;
 			if (Overlay != null) {
@@ -329,7 +329,7 @@ namespace Crow
 		}
 		public virtual void onUnpop(object sender, EventArgs e)
 		{
-			IGOLibHost tc = TopContainer;
+			IGOLibHost tc = HostContainer;
 			if (tc == null)
 				return;
 			Overlay.Visible = false;
diff --git a/src/GraphicObjects/GenericStack.cs b/src/GraphicObjects/GenericStack.cs
index 968c76ac..1624c530 100644
--- a/src/GraphicObjects/GenericStack.cs
+++ b/src/GraphicObjects/GenericStack.cs
@@ -88,6 +88,9 @@ namespace Crow
 		}
 		public virtual void ComputeChildrenPositions()
 		{
+			#if DEBUG_LAYOUTING
+			Debug.WriteLine("ComputeChildrenPosition: " + this.ToString());
+			#endif
 			int d = 0;
 			if (Orientation == Orientation.Horizontal) {
 				foreach (GraphicObject c in Children.Where(ch=>ch.Visible)) {
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index ff94392c..69f19ca2 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -73,6 +73,7 @@ namespace Crow
 		int _margin = 0;
 		bool _focusable = false;
 		bool _hasFocus = false;
+		bool _mouseRepeat;
 		protected bool _isVisible = true;
 		VerticalAlignment _verticalAlignment = VerticalAlignment.Center;
 		HorizontalAlignment _horizontalAlignment = HorizontalAlignment.Center;
@@ -93,6 +94,8 @@ namespace Crow
 		#endregion
 
 		#region ILayoutable
+		//TODO: it would save the recurent cost of a cast in event bubbling if parent type was GraphicObject
+		//		or we could add to the interface the mouse events
 		[XmlIgnore]public ILayoutable Parent { 
 			get { return _parent; }
 			set {
@@ -116,8 +119,8 @@ namespace Crow
 				return cb;
 			}
 		}
-		[XmlIgnore]public virtual IGOLibHost TopContainer {
-			get { return Parent == null ? null : Parent.TopContainer; }
+		[XmlIgnore]public virtual IGOLibHost HostContainer {
+			get { return Parent == null ? null : Parent.HostContainer; }
 		}
 		public virtual Rectangle ContextCoordinates(Rectangle r){
 			return
@@ -141,8 +144,8 @@ namespace Crow
 
 		#region EVENT HANDLERS
 		public event EventHandler<MouseWheelEventArgs> MouseWheelChanged;
-		public event EventHandler<MouseButtonEventArgs> MouseButtonUp;
-		public event EventHandler<MouseButtonEventArgs> MouseButtonDown;
+		public event EventHandler<MouseButtonEventArgs> MouseUp;
+		public event EventHandler<MouseButtonEventArgs> MouseDown;
 		public event EventHandler<MouseButtonEventArgs> MouseClick;
 		public event EventHandler<MouseMoveEventArgs> MouseMove;
 		public event EventHandler<MouseMoveEventArgs> MouseEnter;
@@ -247,35 +250,75 @@ namespace Crow
 		}
 		[XmlAttributeAttribute()][DefaultValue(false)]
 		public virtual bool Focusable {
-			get { return _focusable | Interface.DesignerMode; }
-			set { _focusable = value; }
-		}        
+			get { return _focusable; }
+			set {
+				if (_focusable == value)
+					return;
+				_focusable = value; 
+				NotifyValueChanged ("Focusable", _focusable);
+			}
+		}
+		[XmlIgnore]public virtual bool HasFocus {
+			get { return _hasFocus; }
+			set { 
+				if (value == _hasFocus)
+					return;
+
+				_hasFocus = value; 
+				NotifyValueChanged ("HasFocus", _hasFocus);
+			}
+		}
+		[XmlAttributeAttribute()][DefaultValue(false)]
+		public virtual bool MouseRepeat {
+			get { return _mouseRepeat; }
+			set {
+				if (_mouseRepeat == value)
+					return;
+				_mouseRepeat = value; 
+				NotifyValueChanged ("MouseRepeat", _mouseRepeat);
+			}
+		} 
 		[XmlAttributeAttribute()][DefaultValue("Transparent")]
 		public virtual Color Background {
 			get { return _background; }
 			set {
-				_background = value;
+				if (_background == value)
+					return;
+				_background = value; 
+				NotifyValueChanged ("Background", _background);
 				registerForGraphicUpdate ();
 			}
-		}
+		} 
 		[XmlAttributeAttribute()][DefaultValue("White")]
 		public virtual Color Foreground {
 			get { return _foreground; }
 			set {
-				_foreground = value;
+				if (_foreground == value)
+					return;
+				_foreground = value; 
+				NotifyValueChanged ("Foreground", _foreground);
 				registerForGraphicUpdate ();
 			}
-		}
+		} 
 		[XmlAttributeAttribute()][DefaultValue("droid,10")]
 		public virtual Font Font {
 			get { return _font; }
-			set { _font = value; }
+			set { 
+				if (value == _font)
+					return;				
+				_font = value; 
+				NotifyValueChanged ("Font", _font);
+				registerForGraphicUpdate ();
+			}
 		}
 		[XmlAttributeAttribute()][DefaultValue(0.0)]
 		public virtual double CornerRadius {
 			get { return _cornerRadius; }
 			set {
-				_cornerRadius = value;
+				if (value == _cornerRadius)
+					return;				
+				_cornerRadius = value; 
+				NotifyValueChanged ("CornerRadius", _cornerRadius);
 				registerForGraphicUpdate ();
 			}
 		}
@@ -283,7 +326,10 @@ namespace Crow
 		public virtual int Margin {
 			get { return _margin; }
 			set {
-				_margin = value;
+				if (value == _margin)
+					return;				
+				_margin = value; 
+				NotifyValueChanged ("Margin", _margin);
 				registerForGraphicUpdate ();
 			}
 		}
@@ -296,25 +342,20 @@ namespace Crow
 
 				_isVisible = value;
 
-				if (TopContainer == null)
+				if (HostContainer == null)
 					return;
 				//add slot to clipping to redraw
-				TopContainer.gobjsToRedraw.Add (this);
+				HostContainer.gobjsToRedraw.Add (this);
 
 				//ensure main win doesn't keep hidden childrens ref
-				if (this.Contains (TopContainer.hoverWidget))
-					TopContainer.hoverWidget = null;
+				if (this.Contains (HostContainer.hoverWidget))
+					HostContainer.hoverWidget = null;
 				if (Parent is GenericStack)
 					Parent.RegisterForLayouting ((int)LayoutingType.Sizing | (int)LayoutingType.PositionChildren);
-//					Parent.InvalidateLayout ();
-				//else
-				//    registerForRedraw();
+
+				NotifyValueChanged ("Visible", _isVisible);
 			}
 		}
-		[XmlIgnore]public virtual bool HasFocus {
-			get { return _hasFocus; }
-			set { _hasFocus = value; }
-		}
 		//TODO: only used in group, should be removed from base go object
 		[XmlIgnore]public virtual bool DrawingIsValid
 		{ get { return bmp == null ? 
@@ -450,16 +491,16 @@ namespace Crow
 		public virtual void registerForGraphicUpdate ()
 		{
 			bmp = null;
-			if (TopContainer != null)
-				TopContainer.gobjsToRedraw.Add (this);
+			if (HostContainer != null)
+				HostContainer.gobjsToRedraw.Add (this);
 		}
 		/// <summary>
 		/// Add clipping region in redraw list of interface, dont update cached object content
 		/// </summary>
 		public virtual void RegisterForRedraw ()
 		{
-			if (TopContainer != null)
-				TopContainer.gobjsToRedraw.Add (this);
+			if (HostContainer != null)
+				HostContainer.gobjsToRedraw.Add (this);
 		}
 
 		/// <summary>
@@ -477,10 +518,10 @@ namespace Crow
 
 		public virtual void registerClipRect()
 		{
-			TopContainer.redrawClip.AddRectangle (ScreenCoordinates(Slot));
+			HostContainer.redrawClip.AddRectangle (ScreenCoordinates(Slot));
 			//this clipping should take only last painted slots in ancestor tree which
 			//is not the case for now.
-			TopContainer.redrawClip.AddRectangle (ScreenCoordinates(LastPaintedSlot));
+			HostContainer.redrawClip.AddRectangle (ScreenCoordinates(LastPaintedSlot));
 		}
 		/// <summary> return size of content + margins </summary>
 		protected virtual Size measureRawSize ()
@@ -782,7 +823,7 @@ namespace Crow
 		}
 		public virtual void checkHoverWidget(MouseMoveEventArgs e)
 		{
-			IGOLibHost glh = TopContainer;
+			IGOLibHost glh = HostContainer;
 			if (glh.hoverWidget != this) {
 				glh.hoverWidget = this;
 				onMouseEnter (this, e);
@@ -799,19 +840,37 @@ namespace Crow
 			
 			MouseMove.Raise (sender, e);
 		}
-		public virtual void onMouseButtonUp(object sender, MouseButtonEventArgs e){
-			if (MouseIsIn (e.Position))
-				onMouseClick (sender, e);
-
-			MouseButtonUp.Raise (this, e);
+		public virtual void onMouseDown(object sender, MouseButtonEventArgs e){
+			IGOLibHost hc = HostContainer;
+			if (hc.activeWidget == null)
+				hc.activeWidget = this;
+			if (this.Focusable && !Interface.FocusOnHover) {
+				BubblingMouseButtonEventArg be = e as BubblingMouseButtonEventArg;
+				if (be.Focused == null) {
+					be.Focused = this;
+					hc.FocusedWidget = this;
+				}
+			}
+			//bubble event to the top
+			GraphicObject p = Parent as GraphicObject;
+			if (p != null)
+				p.onMouseDown(sender,e);
+			
+			MouseDown.Raise (this, e);
 		}
-		public virtual void onMouseButtonDown(object sender, MouseButtonEventArgs e){
-			TopContainer.FocusedWidget = this;
+		public virtual void onMouseUp(object sender, MouseButtonEventArgs e){
+			//bubble event to the top
+			GraphicObject p = Parent as GraphicObject;
+			if (p != null)
+				p.onMouseUp(sender,e);
 
-			MouseButtonDown.Raise (this, e);
+			MouseUp.Raise (this, e);
+
+			if (MouseIsIn (e.Position)&&HasFocus)
+				onMouseClick(sender,e);
 		}
-		public virtual void onMouseClick(object sender, MouseButtonEventArgs e){	
-			MouseClick.Raise (this,e);
+		public virtual void onMouseClick(object sender, MouseButtonEventArgs e){							
+			MouseClick.Raise (this, e);
 		}
 		public virtual void onMouseWheel(object sender, MouseWheelEventArgs e){
 			GraphicObject p = Parent as GraphicObject;
@@ -1080,24 +1139,28 @@ namespace Crow
 				GraphicObject lopObj = this;	//default left operand base object is 
 				//the first arg (object sender) of the event handler
 
+				il.Emit(OpCodes.Ldarg_0);	//load sender ref onto the stack
+
 				string[] lopParts = lop.Split (new char[] { '.' });
-				if (lopParts.Length == 2) {//should search also for member of es.Source
-					lopObj = this.FindByName (lopParts [0]);
-					if (lopObj==null)
-						throw new Exception (string.Format("GOML:Unknown name: {0}", lopParts[0]));
-					//TODO: should create private member holding ref of lopObj, and emit
-					//a call to FindByName(lopObjName) during #ctor or in a onLoad func or evt handler
-					throw new Exception (string.Format("GOML:obj tree ref not yet implemented", lopParts[0]));
-				}else
-					il.Emit(OpCodes.Ldarg_0);	//load sender ref onto the stack
+				if (lopParts.Length > 1) {//should search also for member of es.Source
+					MethodInfo FindByNameMi = typeof(GraphicObject).GetMethod("FindByName");
+					for (int j = 0; j < lopParts.Length - 1; j++) {
+						il.Emit (OpCodes.Ldstr, lopParts[j]);
+						il.Emit(OpCodes.Callvirt, FindByNameMi);
+					}
+				}
 
 				int i = lopParts.Length -1;
 
-				MemberInfo lopMbi = lopObj.GetType().GetMember (lopParts[i])[0];
+				MemberInfo[] lopMbis = lopObj.GetType().GetMember (lopParts[i]);
+
+				if (lopMbis.Length<1)
+					throw new Exception (string.Format("CROW BINDING: Member not found '{0}'", lop));
+				
 				OpCode lopSetOC;
 				dynamic lopSetMbi;
 				Type lopT = null;
-				switch (lopMbi.MemberType) {
+				switch (lopMbis[0].MemberType) {
 				case MemberTypes.Property:
 					PropertyInfo lopPi = sourceType.GetProperty (lopParts[i]);
 					MethodInfo dstMi = lopPi.GetSetMethod ();
diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Group.cs
index 7f2ce060..77cb6d64 100644
--- a/src/GraphicObjects/Group.cs
+++ b/src/GraphicObjects/Group.cs
@@ -255,8 +255,8 @@ namespace Crow
 		#region Mouse handling
 		public override void checkHoverWidget (OpenTK.Input.MouseMoveEventArgs e)
 		{
-			if (TopContainer.hoverWidget != this) {
-				TopContainer.hoverWidget = this;
+			if (HostContainer.hoverWidget != this) {
+				HostContainer.hoverWidget = this;
 				onMouseEnter (this, e);
 			}
 			foreach (GraphicObject g in Children)
diff --git a/src/GraphicObjects/ILayoutable.cs b/src/GraphicObjects/ILayoutable.cs
index 0d4201d9..000d377b 100644
--- a/src/GraphicObjects/ILayoutable.cs
+++ b/src/GraphicObjects/ILayoutable.cs
@@ -10,7 +10,7 @@ namespace Crow
 		Rectangle getSlot();
 		Rectangle getBounds();
 
-		IGOLibHost TopContainer { get; }
+		IGOLibHost HostContainer { get; }
 
 		void RegisterForLayouting(int layoutType);
 		void UpdateLayout(LayoutingType layoutType);
diff --git a/src/GraphicObjects/Image.cs b/src/GraphicObjects/Image.cs
index 0aa48ac7..e7f75fe8 100644
--- a/src/GraphicObjects/Image.cs
+++ b/src/GraphicObjects/Image.cs
@@ -15,7 +15,36 @@ namespace Crow
 	{
 		Picture _pic;
 		string _svgSub;
-
+		bool scaled;
+		[XmlAttributeAttribute()][DefaultValue(true)]
+		public virtual bool Scaled {
+			get { return scaled; }
+			set {
+				if (scaled == value)
+					return;
+				scaled = value; 
+				NotifyValueChanged ("Scaled", scaled);
+				if (_pic == null)
+					return;
+				_pic.Scaled = scaled;
+				registerForGraphicUpdate ();
+			}
+		} 
+		bool keepProps;
+		[XmlAttributeAttribute()][DefaultValue(true)]
+		public virtual bool KeepProportions {
+			get { return keepProps; }
+			set {
+				if (keepProps == value)
+					return;
+				keepProps = value; 
+				NotifyValueChanged ("KeepProportions", keepProps);
+				if (_pic == null)
+					return;
+				_pic.KeepProportions = keepProps;
+				registerForGraphicUpdate ();
+			}
+		} 
         [XmlAttributeAttribute("Path")]        
 		public string Path {
 			get { return _pic == null ? null : _pic.Path; }
@@ -26,7 +55,8 @@ namespace Crow
 						return;
 					}
 					LoadImage (value);
-					_pic.KeepProportions = true;
+					_pic.Scaled = scaled;
+					_pic.KeepProportions = keepProps;
 				} catch (Exception ex) {
 					Debug.WriteLine (ex.Message);
 					_pic = null;
@@ -47,23 +77,6 @@ namespace Crow
 		public Image () : base()
 		{
 		}
-		public Image (string _imgPath, Rectangle _bounds)
-            : base(_bounds)
-		{			
-            LoadImage(_imgPath);
-        }
-		public Image (string _imgPath)
-            : base()
-		{			
-            LoadImage(_imgPath);
-		}
-//		public Image (System.Drawing.Bitmap _bitmap)
-//            : base()
-//		{
-//			_pic = new BmpPicture ();
-//
-//			LoadImage (_bitmap);
-//		}
 		#endregion
 
 		#region Image Loading
diff --git a/src/GraphicObjects/Label.cs b/src/GraphicObjects/Label.cs
index 5ad5474a..460dcbdc 100644
--- a/src/GraphicObjects/Label.cs
+++ b/src/GraphicObjects/Label.cs
@@ -35,10 +35,11 @@ namespace Crow
 		bool _multiline = false;
 		Color selColor;
 		Color selFontColor;
-		bool _selectable;
-		Point mouseLocalPos;    //mouse coord in widget space, filled only when clicked        
+		Point mouseLocalPos = -1;//mouse coord in widget space, filled only when clicked        
 		int _currentCol;        //0 based cursor position in string
 		int _currentLine;
+		Point _selBegin = -1;	//selection start (row,column)
+		Point _selRelease = -1;	//selection end (row,column)
 		double textCursorPos;   //cursor position in cairo units in widget client coord.
 		double SelStartCursorPos = -1;
 		double SelEndCursorPos = -1;
@@ -55,24 +56,24 @@ namespace Crow
 		public virtual Color SelectionBackground {
 			get { return selColor; }
 			set {
+				if (value == selColor)
+					return;
 				selColor = value;
+				NotifyValueChanged ("SelectionBackground", selColor);
 				registerForGraphicUpdate ();
 			}
 		}
-		[XmlAttributeAttribute()][DefaultValue("Black")]
+		[XmlAttributeAttribute()][DefaultValue("DarkGray")]
 		public virtual Color SelectionForeground {
 			get { return selFontColor; }
 			set {
+				if (value == selFontColor)
+					return;
 				selFontColor = value;
+				NotifyValueChanged ("SelectionForeground", selFontColor);
 				registerForGraphicUpdate ();
 			}
 		}
-		[XmlAttributeAttribute()][DefaultValue(false)]
-		public virtual bool Selectable {
-			get { return _selectable; }
-			set { _selectable = value; }
-		}
-
         [XmlAttributeAttribute()][DefaultValue(Alignment.LeftCenter)]
 		public Alignment TextAlignment
         {
@@ -90,24 +91,19 @@ namespace Crow
             {
                 if (_text == value)
                     return;
-					                
-                registerForGraphicUpdate();
-				this.RegisterForLayouting ((int)LayoutingType.Sizing);
-
-
+					                                
                 _text = value;
 
 				if (string.IsNullOrEmpty(_text))
 					_text = "";
 
 				lines = getLines;
+
+				//registerForGraphicUpdate();
+				this.RegisterForLayouting ((int)LayoutingType.Sizing);
+				NotifyValueChanged ("Text", Text);
             }
         }
-		[XmlAttributeAttribute()][DefaultValue("droid,10")]
-		public Font Font {
-			get { return _font; }
-			set { _font = value; }
-		}
 		[XmlAttributeAttribute()][DefaultValue(false)]
 		public bool Multiline
 		{
@@ -126,7 +122,7 @@ namespace Crow
 				else if (value > lines [_currentLine].Count ())
 					_currentCol = lines [_currentLine].Count ();
 				else
-					_currentCol = value; 
+					_currentCol = value;
 			}
 		}
 		[XmlIgnore]public int currentLine{
@@ -140,40 +136,71 @@ namespace Crow
 					_currentLine = value; 
 			}
 		}
-		[XmlIgnore]protected Point selBegin;
-		[XmlIgnore]protected Point selRelease;
+
+		[XmlIgnore]public Point SelBegin {
+			get {
+				return _selBegin;
+			}
+			set {
+				if (value == _selBegin)
+					return;
+				_selBegin = value;
+				NotifyValueChanged ("SelectedText", SelectedText);
+			}
+		}			
+		[XmlIgnore]public Point SelRelease {
+			get {
+				return _selRelease;
+			}
+			set {
+				if (value == _selRelease)
+					return;
+				_selRelease = value;
+				NotifyValueChanged ("SelectedText", SelectedText);
+			}
+		}
+
 		[XmlIgnore]protected Point selectionStart   //ordered selection start and end positions
 		{
 			get { 
-				return selRelease < 0 || selBegin.Y < selRelease.Y ? selBegin : 
-					selBegin.Y > selRelease.Y ? selRelease :
-					selBegin.X < selRelease.X ? selBegin : selRelease;
+				return SelRelease < 0 || SelBegin.Y < SelRelease.Y ? SelBegin : 
+					SelBegin.Y > SelRelease.Y ? SelRelease :
+					SelBegin.X < SelRelease.X ? SelBegin : SelRelease;
 			}
 		}
 		[XmlIgnore]public Point selectionEnd
 		{  
 			get { 
-				return selRelease < 0 || selBegin.Y > selRelease.Y ? selBegin : 
-					selBegin.Y < selRelease.Y ? selRelease :
-					selBegin.X > selRelease.X ? selBegin : selRelease;
+				return SelRelease < 0 || SelBegin.Y > SelRelease.Y ? SelBegin : 
+					SelBegin.Y < SelRelease.Y ? SelRelease :
+					SelBegin.X > SelRelease.X ? SelBegin : SelRelease;
 			}		
 		}
-		[XmlIgnore]public string selectedText
+		[XmlIgnore]public string SelectedText
 		{ 
-			get { 
-				return null; 
-					//selectionEnd < 0 ? null : 
-					//Text.Substring(selectionStart, selectionEnd - selectionStart); 
+			get {
+				
+				if (SelRelease < 0 || SelBegin < 0)
+					return "";
+				if (selectionStart.Y == selectionEnd.Y)
+					return lines [selectionStart.Y].Substring (selectionStart.X, selectionEnd.X - selectionStart.X);
+				string tmp = "";
+				tmp = lines [selectionStart.Y].Substring (selectionStart.X);
+				for (int l = selectionStart.Y + 1; l < selectionEnd.Y; l++) {
+					tmp += Interface.LineBreak + lines [l];
+				}
+				tmp += Interface.LineBreak + lines [selectionEnd.Y].Substring (0, selectionEnd.X);
+				return tmp;
 			}			
 		}
 		[XmlIgnore]public bool selectionIsEmpty
-		{ get { return selRelease < 0; } }
+		{ get { return SelRelease < 0; } }
 
 		List<string> lines;
 		List<string> getLines {
 			get {				
 				return _multiline ?
-					Regex.Split (_text, "\r\n|\r|\n").ToList() :
+					Regex.Split (_text, "\r\n|\r|\n|" + @"\\n").ToList() :
 					new List<string>(new string[] { _text });
 			}
 		}
@@ -208,8 +235,8 @@ namespace Crow
 				} else 
 					lines [l] = lines [l].Remove (selectionStart.X, selectionEnd.X - selectionStart.X);
 				currentCol = selectionStart.X;
-				selBegin = -1;
-				selRelease = -1;
+				SelBegin = -1;
+				SelRelease = -1;
 			}
 		}
 		/// <summary>
@@ -389,77 +416,94 @@ namespace Crow
 					break;
 				}
 			}
+			OpenTKGameWindow.currentWindow.CursorVisible = true;
 
 			#region draw text cursor
-			if (mouseLocalPos > 0)
+			if (mouseLocalPos >= 0)
 			{
 				computeTextCursor(gr);
 
 				if (SelectionInProgress)
 				{
-					selRelease = new Point(currentCol, currentLine);
-					SelEndCursorPos = textCursorPos;
+					if (SelBegin < 0){
+						SelBegin = new Point(currentCol, currentLine);
+						SelStartCursorPos = textCursorPos;
+						SelRelease = -1;
+					}else{
+						SelRelease = new Point(currentCol, currentLine);
+						if (SelRelease == SelBegin)
+							SelRelease = -1;
+						else
+							SelEndCursorPos = textCursorPos;
+					}						
 				}
-				else if (selBegin < 0)
-				{
-					selBegin = new Point(currentCol, currentLine);
-					SelStartCursorPos = textCursorPos;
-					selRelease = -1;
-				}
-				else
-					computeTextCursorPosition(gr);
-			}
-			else
+			}else
 				computeTextCursorPosition(gr);
 
-			if (HasFocus && Selectable)
+
+			#endregion
+
+			//*******************
+			//debug selection
+			if (SelRelease >= 0) {
+				gr.Color = Color.Green;
+				Rectangle R = new Rectangle (
+					             rText.X + (int)SelEndCursorPos - 2,
+					             rText.Y + (int)(SelRelease.Y * fe.Height), 
+					             4, 
+					             (int)fe.Height);
+				gr.Rectangle (R);
+				gr.Fill ();
+			}
+			if (SelBegin >= 0) {
+				gr.Color = Color.UnmellowYellow;
+				Rectangle R = new Rectangle (
+					rText.X + (int)SelStartCursorPos - 2,
+					rText.Y + (int)(SelBegin.Y * fe.Height), 
+					4, 
+					(int)fe.Height);
+				gr.Rectangle (R);
+				gr.Fill ();
+			}
+			//*******************
+			if (HasFocus )
 			{
 				//TODO:
-				gr.Color = Foreground;
+				gr.SetSourceColor(Foreground);
 				gr.LineWidth = 1.5;
 				gr.MoveTo(new PointD(textCursorPos + rText.X, rText.Y + currentLine * fe.Height));
 				gr.LineTo(new PointD(textCursorPos + rText.X, rText.Y + (currentLine + 1) * fe.Height));
 				gr.Stroke();
 			}
-			#endregion
-
-			//*******************
-			//debug selection
-//			gr.Color = Color.Green;
-//			Rectangle R = new Rectangle(
-//				rText.X +  (int)SelEndCursorPos-10,
-//				rText.Y + (int)(selRelease.Y * fe.Height), 
-//				20, 
-//				(int)fe.Height);
-//			gr.Rectangle(R);
-//			gr.Fill();
-//			gr.Color = Color.UnmellowYellow;
-//			R = new Rectangle(
-//				rText.X + (int)SelStartCursorPos-10,
-//				rText.Y + (int)(selBegin.Y * fe.Height), 
-//				20, 
-//				(int)fe.Height);
-//			gr.Rectangle(R);
-//			gr.Fill();
-			//*******************
-
 			gr.FontMatrix = new Matrix(widthRatio * Font.Size, 0, 0, heightRatio * Font.Size, 0, 0);
-
+			OpenTKGameWindow.currentWindow.CursorVisible = true;
 			for (int i = 0; i < lines.Count; i++) {				
 				string l = lines [i].Replace ("\t", new String (' ', Interface.TabSize));
-				if (selRelease >= 0 && i >= selectionStart.Y && i <= selectionEnd.Y) {					
-					gr.Color = selColor;
-					int lineLength = (int)gr.TextExtents (l).XAdvance;
-					Rectangle selRect = new Rectangle (
-						rText.X,
-						rText.Y + (int)(i * fe.Height), 
-						lineLength, 
-						(int)fe.Height);
+				int lineLength = (int)gr.TextExtents (l).XAdvance;
+				Rectangle lineRect = new Rectangle (
+					rText.X,
+					rText.Y + (int)(i * fe.Height), 
+					lineLength, 
+					(int)fe.Height);
+
+//				if (TextAlignment == Alignment.Center ||
+//					TextAlignment == Alignment.TopCenter ||
+//					TextAlignment == Alignment.BottomCenter)
+//					lineRect.X += (rText.Width - lineLength) / 2;
+//				else if (TextAlignment == Alignment.RightCenter ||
+//					TextAlignment == Alignment.TopRight ||
+//					TextAlignment == Alignment.BottomRight)
+//					lineRect.X += (rText.Width - lineLength);
+				
+				if (SelRelease >= 0 && i >= selectionStart.Y && i <= selectionEnd.Y) {					
+					gr.SetSourceColor(selColor);
+
+					Rectangle selRect = lineRect ;
 
 					int cpStart = (int)SelStartCursorPos,
 						cpEnd = (int)SelEndCursorPos;
 
-					if (selBegin.Y > selRelease.Y) {
+					if (SelBegin.Y > SelRelease.Y) {
 						cpStart = cpEnd;
 						cpEnd = (int)SelStartCursorPos;
 					}
@@ -477,27 +521,9 @@ namespace Crow
 
 				if (string.IsNullOrWhiteSpace (l))
 					continue;
-			
-//				double t = rText.Y;
-//				gr.LineWidth = 1;
-//				gr.Color = Color.Green;
-//				gr.MoveTo (rText.X, t);
-//				gr.LineTo (rText.X + rText.Width, t);
-//				gr.Stroke ();
-//				gr.MoveTo (rText.X, t + rText.Height);
-//				gr.LineTo (rText.X + rText.Width, t + rText.Height);
-//				gr.Stroke ();
-//				gr.Rectangle (rText);
-//				gr.Fill ();
-//
-//				t += fe.Ascent;
-//				gr.Color = Color.Red;
-//				gr.MoveTo (rText.X, t);
-//				gr.LineTo (rText.X + rText.Width, t);
-//				gr.Stroke ();
-
-				gr.Color = Foreground;				
-				gr.MoveTo (rText.X, rText.Y + fe.Ascent + fe.Height * i);
+
+				gr.SetSourceColor(Foreground);	
+				gr.MoveTo (lineRect.X, rText.Y + fe.Ascent + fe.Height * i);
 
 				#if _WIN32 || _WIN64
 				gr.ShowText(l.ToUtf8());
@@ -505,65 +531,81 @@ namespace Crow
 				gr.ShowText (l);
 				#endif
 				gr.Fill ();
-
-			}						
+			}
 		}
 		#endregion
 
 		#region Mouse handling
-		public override void onMouseEnter (object sender, MouseMoveEventArgs e)
+		void updatemouseLocalPos(Point mpos){
+			mouseLocalPos = mpos - ScreenCoordinates(Slot).TopLeft - ClientRectangle.TopLeft;
+			if (mouseLocalPos.X < 0)
+				mouseLocalPos.X = 0;
+			if (mouseLocalPos.Y < 0)
+				mouseLocalPos.Y = 0;
+		}
+		public override void onFocused (object sender, EventArgs e)
 		{
-			//			SelectionInProgress = true;                
-			//			mouseLocalPos = e.Position - ScreenCoordBounds.TopLeft - rText.TopLeft;
-			//			registerForGraphicUpdate();
+			base.onFocused (sender, e);
 
-			base.onMouseEnter (sender, e);
+			SelBegin = new Point(0,0);
+			SelRelease = new Point (lines.LastOrDefault ().Length, lines.Count-1);
+			OpenTKGameWindow.currentWindow.CursorVisible = true;
+			registerForGraphicUpdate ();
+			Debug.WriteLine("focused:", this.ToString());
 		}
-		public override void onMouseLeave (object sender, MouseMoveEventArgs e)
+		public override void onUnfocused (object sender, EventArgs e)
 		{
-			base.onMouseLeave (sender, e);
+			base.onUnfocused (sender, e);
+
+			SelBegin = -1;
+			SelRelease = -1;
+
+			registerForGraphicUpdate ();
+			Debug.WriteLine("unfocused:", this.ToString());
 		}
 		public override void onMouseMove (object sender, MouseMoveEventArgs e)
 		{
 			base.onMouseMove (sender, e);
 
-			IGOLibHost glh = TopContainer;
-			if (glh.activeWidget != this)
-				return;
-			if (!Selectable)
+			if (!(SelectionInProgress && HasFocus))
 				return;
-			
-			SelectionInProgress = true;
-			mouseLocalPos = e.Position - ScreenCoordinates(ClientRectangle).TopLeft;
+
+			updatemouseLocalPos (e.Position);
+
 			registerForGraphicUpdate();
 		}
-		public override void onMouseButtonDown (object sender, MouseButtonEventArgs e)
-		{
-			if (this.HasFocus && Selectable){
-				mouseLocalPos = e.Position - ScreenCoordinates(ClientRectangle).TopLeft;
-				selBegin = -1;
-				selRelease = -1;
-			}else{
-//				selBeginPos = 0;
-//				selReleasePos = new Point(lines[lines.Count].Length-1, lines.Count-1);
-			}            
+		public override void onMouseDown (object sender, MouseButtonEventArgs e)
+		{			
+			if (this.HasFocus){
+				updatemouseLocalPos (e.Position);
+				SelBegin = -1;
+				SelRelease = -1;
+				SelectionInProgress = true;
+			}          
 
 			//done at the end to set 'hasFocus' value after testing it
-			base.onMouseButtonDown (sender, e);
+			base.onMouseDown (sender, e);
 
 			registerForGraphicUpdate();
 		}
-		public override void onMouseButtonUp (object sender, MouseButtonEventArgs e)
+		public override void onMouseUp (object sender, MouseButtonEventArgs e)
 		{
-			base.onMouseButtonUp (sender, e);
+			base.onMouseUp (sender, e);
+
+			if (!SelectionInProgress)
+				return;
+			
+			updatemouseLocalPos (e.Position);
 			SelectionInProgress = false;
+			registerForGraphicUpdate ();
 		}
 		#endregion
-
-
+		/// <summary>
+		/// Update Current Column, line and TextCursorPos
+		/// from mouseLocalPos
+		/// </summary>
 		void computeTextCursor(Context gr)
-		{
-			//FontExtents fe = gr.FontExtents;
+		{			
 			TextExtents te;
 
 			double cPos = 0f;
@@ -604,41 +646,25 @@ namespace Crow
 			//reset mouseLocalPos
 			mouseLocalPos = -1;
 		}
+		/// <summary> Computes offsets in cairo units </summary>
 		void computeTextCursorPosition(Context gr)
 		{			
-			TextExtents te;
-
-			double cPos = 0f;
-
-			int limit = currentCol;
-
-			if (selectionEnd > 0)
-				limit = Math.Max(currentCol, selectionEnd.X);
-
-			for (int i = 0; i <= limit; i++)
-			{
-				if (i == currentCol)
-					textCursorPos = cPos;
-				if (i == selectionStart.X)
-					SelStartCursorPos = cPos;
-				if (i == selectionEnd.X)
-					SelEndCursorPos = cPos;
-
-				if (i < lines[currentLine].Length)
-				{
-					string c = lines [currentLine].Substring (i, 1);
-					if (c == "\t")
-						c = new string (' ', Interface.TabSize);
-					#if _WIN32 || _WIN64
-					byte[] c = System.Text.UTF8Encoding.UTF8.GetBytes(Text.Substring(i, 1));
-					te = gr.TextExtents(c);
-					#elif __linux__
-					te = gr.TextExtents(c);
-					#endif
-					cPos += te.XAdvance;
-				}
+			if (SelBegin >= 0)
+				SelStartCursorPos = GetXFromTextPointer (gr, SelBegin);
+			if (SelRelease >= 0)
+				SelEndCursorPos = GetXFromTextPointer (gr, SelRelease);
+			textCursorPos = GetXFromTextPointer (gr, new Point(currentCol, currentLine));
+		}
+		/// <summary> Compute x offset in cairo unit from text position </summary>
+		double GetXFromTextPointer(Context gr, Point pos)
+		{
+			try {
+				string l = lines [pos.Y].Substring (0, pos.X).
+					Replace ("\t", new String (' ', Interface.TabSize));
+				return gr.TextExtents (l).XAdvance;
+			} catch (Exception ex) {
+				return -1;
 			}
-
-		}		
+		}
     }
 }
diff --git a/src/GraphicObjects/NumericControl.cs b/src/GraphicObjects/NumericControl.cs
index e323ef3e..3e35f102 100644
--- a/src/GraphicObjects/NumericControl.cs
+++ b/src/GraphicObjects/NumericControl.cs
@@ -13,10 +13,6 @@ namespace Crow
 		public NumericControl(double minimum, double maximum, double step)
 			: base()
 		{
-			minValue = minimum;
-			maxValue = maximum;
-			smallStep = step;
-			bigStep = step * 5;
 		}
 		#endregion
 
diff --git a/src/GraphicObjects/Popper.cs b/src/GraphicObjects/Popper.cs
index 15a209ce..2ed1c06f 100644
--- a/src/GraphicObjects/Popper.cs
+++ b/src/GraphicObjects/Popper.cs
@@ -158,7 +158,7 @@ namespace Crow
 			
 		public virtual void onPop(object sender, EventArgs e)
 		{
-			IGOLibHost tc = TopContainer;
+			IGOLibHost tc = HostContainer;
 			if (tc == null)
 				return;
 			if (Content != null) {
@@ -172,7 +172,7 @@ namespace Crow
 		}
 		public virtual void onUnpop(object sender, EventArgs e)
 		{
-			IGOLibHost tc = TopContainer;
+			IGOLibHost tc = HostContainer;
 			if (tc == null)
 				return;
 			Content.Visible = false;
diff --git a/src/GraphicObjects/Scroller.cs b/src/GraphicObjects/Scroller.cs
index ec0def4d..a4eb2a57 100644
--- a/src/GraphicObjects/Scroller.cs
+++ b/src/GraphicObjects/Scroller.cs
@@ -202,7 +202,7 @@ namespace Crow
 
 		public override void registerClipRect ()
 		{
-			TopContainer.redrawClip.AddRectangle (base.ScreenCoordinates(Slot));
+			HostContainer.redrawClip.AddRectangle (base.ScreenCoordinates(Slot));
 		}
 
 		public override void Paint(ref Cairo.Context ctx, Rectangles clip = null)
diff --git a/src/GraphicObjects/Slider.cs b/src/GraphicObjects/Slider.cs
index 7b44a93e..2351669c 100644
--- a/src/GraphicObjects/Slider.cs
+++ b/src/GraphicObjects/Slider.cs
@@ -158,9 +158,9 @@ namespace Crow
         }
         
 		#region mouse handling
-		public override void onMouseButtonDown (object sender, OpenTK.Input.MouseButtonEventArgs e)
+		public override void onMouseDown (object sender, OpenTK.Input.MouseButtonEventArgs e)
 		{
-			base.onMouseButtonDown (sender, e);
+			base.onMouseDown (sender, e);
 
 			Rectangle cursInScreenCoord = ScreenCoordinates (cursor + Slot.Position);
 			if (cursInScreenCoord.ContainsOrIsEqual (e.Position))
@@ -177,9 +177,9 @@ namespace Crow
 					Value += LargeIncrement;
 			}
 		}
-		public override void onMouseButtonUp (object sender, OpenTK.Input.MouseButtonEventArgs e)
+		public override void onMouseUp (object sender, OpenTK.Input.MouseButtonEventArgs e)
 		{
-			base.onMouseButtonUp (sender, e);
+			base.onMouseUp (sender, e);
 
 			holdCursor = false;
 		}
diff --git a/src/GraphicObjects/TextBox.cs b/src/GraphicObjects/TextBox.cs
index 9fca2fea..f2fdace6 100644
--- a/src/GraphicObjects/TextBox.cs
+++ b/src/GraphicObjects/TextBox.cs
@@ -44,11 +44,6 @@ namespace Crow
 			get { return base.Focusable; }
 			set { base.Focusable = value; }
 		}
-		[XmlAttributeAttribute()][DefaultValue(true)]
-		public override bool Selectable {
-			get { return base.Selectable; }
-			set { base.Selectable = value; }
-		}
 		[XmlAttributeAttribute()][DefaultValue("White")]
 		public override Color Background {
 			get { return base.Background; }
@@ -107,7 +102,7 @@ namespace Crow
 			case Key.Escape:
 				Text = "";
 				currentCol = 0;
-				selRelease = -1;
+				SelRelease = -1;
 				break;
 			case Key.Home:
 				//TODO
@@ -195,8 +190,8 @@ namespace Crow
 
 				this.Insert (k);
 
-				selRelease = -1;
-				selBegin.X = currentCol;
+				SelRelease = -1;
+				SelBegin = new Point(currentCol, SelBegin.Y);
 
 				break;
 			}
diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Window.cs
index 50176d6f..d98d296c 100644
--- a/src/GraphicObjects/Window.cs
+++ b/src/GraphicObjects/Window.cs
@@ -83,127 +83,134 @@ namespace Crow
 		{
 			base.onMouseMove (sender, e);
 
-			OpenTKGameWindow otkgw = TopContainer as OpenTKGameWindow;
-
-			if (otkgw.activeWidget == null) {
-				if (Resizable) {
-					Direction lastDir = currentDirection;
-
-					if (Math.Abs (e.Position.Y - this.Slot.Y) < Interface.BorderThreshold) {
-						if (Math.Abs (e.Position.X - this.Slot.X) < Interface.BorderThreshold)
-							currentDirection = Direction.NW;
-						else if (Math.Abs (e.Position.X - this.Slot.Right) < Interface.BorderThreshold)
-							currentDirection = Direction.NE;
-						else
-							currentDirection = Direction.N;
-					} else if (Math.Abs (e.Position.Y - this.Slot.Bottom) < Interface.BorderThreshold) {
-						if (Math.Abs (e.Position.X - this.Slot.X) < Interface.BorderThreshold)
-							currentDirection = Direction.SW;
-						else if (Math.Abs (e.Position.X - this.Slot.Right) < Interface.BorderThreshold)
-							currentDirection = Direction.SE;
-						else
-							currentDirection = Direction.S;
-					} else if (Math.Abs (e.Position.X - this.Slot.X) < Interface.BorderThreshold)
-						currentDirection = Direction.W;
-					else if (Math.Abs (e.Position.X - this.Slot.Right) < Interface.BorderThreshold)
-						currentDirection = Direction.E;
-					else
-						currentDirection = Direction.None;
-
-					if (currentDirection != lastDir) {
-						switch (currentDirection) {
-						case Direction.None:
-							otkgw.Cursor = XCursor.Default;
-							break;
-						case Direction.N:
-							otkgw.Cursor = XCursor.V;
-							break;
-						case Direction.S:
-							otkgw.Cursor = XCursor.V;
-							break;
-						case Direction.E:
-							otkgw.Cursor = XCursor.H;
-							break;
-						case Direction.W:
-							otkgw.Cursor = XCursor.H;
-							break;
-						case Direction.NW:
-							otkgw.Cursor = XCursor.NW;
-							break;
-						case Direction.NE:
-							otkgw.Cursor = XCursor.NE;
-							break;
-						case Direction.SW:
-							otkgw.Cursor = XCursor.SW;
-							break;
-						case Direction.SE:
-							otkgw.Cursor = XCursor.SE;
-							break;
-						}
-					}				
+			OpenTKGameWindow otkgw = HostContainer as OpenTKGameWindow;
+
+			if (e.Mouse.IsButtonDown (MouseButton.Left)) {
+				if (!HasFocus)
+					return;
+				
+				otkgw.redrawClip.AddRectangle (this.ScreenCoordinates(this.Slot));
+
+				int currentLeft = this.Left;
+				int currentTop = this.Top;
+
+				if (currentLeft == 0)
+					currentLeft = this.Slot.Left;
+				if (currentTop == 0)
+					currentTop = this.Slot.Top;
+
+				switch (currentDirection) {
+				case Direction.None:
+					this.Left = currentLeft + e.XDelta;				
+					this.Top = currentTop + e.YDelta;
+					break;
+				case Direction.N:
+					this.Top = currentTop + e.YDelta;
+					this.Height -= e.YDelta;
+					break;
+				case Direction.S:
+					this.Height += e.YDelta;
+					break;
+				case Direction.W:
+					this.Left = currentLeft + e.XDelta;
+					this.Width -= e.XDelta;
+					break;
+				case Direction.E:
+					this.Width += e.XDelta;
+					break;
+				case Direction.NW:
+					this.Left = currentLeft + e.XDelta;
+					this.Top = currentTop + e.YDelta;
+					this.Width -= e.XDelta;
+					this.Height -= e.YDelta;
+					break;
+				case Direction.NE:
+					this.Width += e.XDelta;
+					this.Top = currentTop + e.YDelta;
+					this.Height -= e.YDelta;
+					break;
+				case Direction.SW:
+					this.Left = currentLeft + e.XDelta;
+					this.Width -= e.XDelta;
+					this.Height += e.YDelta;
+					break;
+				case Direction.SE:
+					this.Width += e.XDelta;
+					this.Height += e.YDelta;
+					break;
 				}
 				return;
 			}
+			GraphicObject firstFocusableAncestor = otkgw.hoverWidget;
+			while (firstFocusableAncestor != this) {
+				if (firstFocusableAncestor == null)
+					return;
+				if (firstFocusableAncestor.Focusable)
+					return;
+				firstFocusableAncestor = firstFocusableAncestor.Parent as GraphicObject;
+			}
+			if (Resizable) {
+				Direction lastDir = currentDirection;
 
-			if (TopContainer.activeWidget != this)
-				return;
-				
-			this.TopContainer.redrawClip.AddRectangle (this.ScreenCoordinates(this.Slot));
-
-			int currentLeft = this.Left;
-			int currentTop = this.Top;
-
-			if (currentLeft == 0)
-				currentLeft = this.Slot.Left;
-			if (currentTop == 0)
-				currentTop = this.Slot.Top;
-
-			switch (currentDirection) {
-			case Direction.None:
-				this.Left = currentLeft + e.XDelta;				
-				this.Top = currentTop + e.YDelta;
-				break;
-			case Direction.N:
-				this.Top = currentTop + e.YDelta;
-				this.Height -= e.YDelta;
-				break;
-			case Direction.S:
-				this.Height += e.YDelta;
-				break;
-			case Direction.W:
-				this.Left = currentLeft + e.XDelta;
-				this.Width -= e.XDelta;
-				break;
-			case Direction.E:
-				this.Width += e.XDelta;
-				break;
-			case Direction.NW:
-				this.Left = currentLeft + e.XDelta;
-				this.Top = currentTop + e.YDelta;
-				this.Width -= e.XDelta;
-				this.Height -= e.YDelta;
-				break;
-			case Direction.NE:
-				this.Width += e.XDelta;
-				this.Top = currentTop + e.YDelta;
-				this.Height -= e.YDelta;
-				break;
-			case Direction.SW:
-				this.Left = currentLeft + e.XDelta;
-				this.Width -= e.XDelta;
-				this.Height += e.YDelta;
-				break;
-			case Direction.SE:
-				this.Width += e.XDelta;
-				this.Height += e.YDelta;
-				break;
-			}		
+				if (Math.Abs (e.Position.Y - this.Slot.Y) < Interface.BorderThreshold) {
+					if (Math.Abs (e.Position.X - this.Slot.X) < Interface.BorderThreshold)
+						currentDirection = Direction.NW;
+					else if (Math.Abs (e.Position.X - this.Slot.Right) < Interface.BorderThreshold)
+						currentDirection = Direction.NE;
+					else
+						currentDirection = Direction.N;
+				} else if (Math.Abs (e.Position.Y - this.Slot.Bottom) < Interface.BorderThreshold) {
+					if (Math.Abs (e.Position.X - this.Slot.X) < Interface.BorderThreshold)
+						currentDirection = Direction.SW;
+					else if (Math.Abs (e.Position.X - this.Slot.Right) < Interface.BorderThreshold)
+						currentDirection = Direction.SE;
+					else
+						currentDirection = Direction.S;
+				} else if (Math.Abs (e.Position.X - this.Slot.X) < Interface.BorderThreshold)
+					currentDirection = Direction.W;
+				else if (Math.Abs (e.Position.X - this.Slot.Right) < Interface.BorderThreshold)
+					currentDirection = Direction.E;
+				else
+					currentDirection = Direction.None;
+
+				if (currentDirection != lastDir) {
+					switch (currentDirection) {
+					case Direction.None:
+						otkgw.Cursor = XCursor.Default;
+						break;
+					case Direction.N:
+						otkgw.Cursor = XCursor.V;
+						break;
+					case Direction.S:
+						otkgw.Cursor = XCursor.V;
+						break;
+					case Direction.E:
+						otkgw.Cursor = XCursor.H;
+						break;
+					case Direction.W:
+						otkgw.Cursor = XCursor.H;
+						break;
+					case Direction.NW:
+						otkgw.Cursor = XCursor.NW;
+						break;
+					case Direction.NE:
+						otkgw.Cursor = XCursor.NE;
+						break;
+					case Direction.SW:
+						otkgw.Cursor = XCursor.SW;
+						break;
+					case Direction.SE:
+						otkgw.Cursor = XCursor.SE;
+						break;
+					}
+				}				
+			}				
 		}
 		public override void onMouseLeave (object sender, MouseMoveEventArgs e)
 		{
 			base.onMouseLeave (sender, e);
 			currentDirection = Direction.None;
-			OpenTKGameWindow otkgw = TopContainer as OpenTKGameWindow;
+			OpenTKGameWindow otkgw = HostContainer as OpenTKGameWindow;
 			otkgw.Cursor = XCursor.Default;
 		}
 
@@ -218,7 +225,7 @@ namespace Crow
 			ILayoutable parent = (sender as GraphicObject).Parent;
 			while(!(parent is Window))
 				parent = parent.Parent;
-			TopContainer.DeleteWidget (parent as GraphicObject);
+			HostContainer.DeleteWidget (parent as GraphicObject);
 		}
 
 		public override void ResolveBindings ()
diff --git a/src/Interface.cs b/src/Interface.cs
index b6e5b3f1..9b291a32 100644
--- a/src/Interface.cs
+++ b/src/Interface.cs
@@ -42,55 +42,21 @@ namespace Crow
 
 		public static int TabSize = 4;
 		public static string LineBreak = "\r\n";
+		public static bool FocusOnHover = false;
+		/// <summary> Time to wait in millisecond before starting repeat loop</summary>
+		public static int DeviceRepeatDelay = 1000;
+		/// <summary> Time interval in millisecond between device event repeat</summary>
+		public static int DeviceRepeatInterval = 100;
 		public static bool ReplaceTabsWithSpace = false;
 		/// <summary> Allow rendering of interface in development environment </summary>
 		public static bool DesignerMode = false;
 		/// <summary> Threshold to catch borders for sizing </summary>
 		public static int BorderThreshold = 5;
 
-		/// <summary>
-		/// Graphic objects References use in dynamic delegates for binding
-		/// </summary>
-		public static List<object> References = new List<object> ();
-		public static Queue<int> FreeRefIndices = new Queue<int> ();
 		public static List<ListBox> LoadingLists= new List<ListBox>();
-
-		public static void Unreference (Object o)
-		{
-			int idxt = Interface.References.IndexOf (o);
-			if (idxt < 0)
-				return;
-			References [idxt] = null;
-			FreeRefIndices.Enqueue (idxt);
-		}
-
-		/// <summary> register target object reference in an array for binding CIL </summary>
-		public static int Reference (object o)
-		{
-			
-			int dstIdx = Interface.References.IndexOf (o);
-
-			if (dstIdx < 0) {
-				if (FreeRefIndices.Count == 0) {
-					dstIdx = Interface.References.Count ();
-					Interface.References.Add (o);
-				} else {
-					dstIdx = FreeRefIndices.Dequeue ();
-					Interface.References [dstIdx] = o;
-				}
-			}
-			return dstIdx;
-		}
-
 		public static LayoutingQueue LayoutingQueue = new LayoutingQueue ();
 
 		#region Load/Save
-
-		internal static Stack<List<DynAttribute>> GOMLResolutionStack = new Stack<List<DynAttribute>> ();
-
-		internal static List<DynAttribute> GOMLResolver {
-			get { return GOMLResolutionStack.Peek (); }
-		}
 		//internal static List<DynAttribute> Bindings;
 
 
diff --git a/src/OpenTKGameWindow.cs b/src/OpenTKGameWindow.cs
index e29f44c8..2db35fc7 100644
--- a/src/OpenTKGameWindow.cs
+++ b/src/OpenTKGameWindow.cs
@@ -109,7 +109,7 @@ namespace Crow
 			set 
 			{
 				if (_activeWidget == value)
-					return;
+					return;				
 				_activeWidget = value;
 			}
 		}
@@ -165,7 +165,6 @@ namespace Crow
 		Crow.Shader shader;
 		int[] viewport = new int[4];
 
-		Rectangle dirtyZone = Rectangle.Empty;
 		void createContext()
 		{			
 			createOpenGLSurface ();
@@ -224,23 +223,6 @@ namespace Crow
 			shader.Disable ();
 			GL.Viewport (viewport [0], viewport [1], viewport [2], viewport [3]);
 		}
-//		public void RenderCustomTextureOnUIQuad(int _customTex)
-//		{
-//			GL.GetInteger (GetPName.Viewport, viewport);
-//			GL.Viewport (0, 0, ClientRectangle.Width, ClientRectangle.Height);
-//
-//			shader.Enable ();
-//
-//			GL.ActiveTexture (TextureUnit.Texture0);
-//			GL.BindTexture (TextureTarget.Texture2D, _customTex);
-//			GL.Disable (EnableCap.DepthTest);
-//			uiQuad2.Render (PrimitiveType.TriangleStrip);
-//			GL.Enable (EnableCap.DepthTest);
-//			GL.BindTexture(TextureTarget.Texture2D, 0);
-//			shader.Disable ();
-//			GL.Viewport (viewport [0], viewport [1], viewport [2], viewport [3]);			
-//		}
-			
 		#endregion
 
 		#region update
@@ -251,6 +233,14 @@ namespace Crow
 
 		void update ()
 		{
+			if (mouseRepeatCount > 0) {
+				int mc = mouseRepeatCount;
+				mouseRepeatCount -= mc;
+				for (int i = 0; i < mc; i++) {
+					FocusedWidget.onMouseClick (this, new MouseButtonEventArgs (Mouse.X, Mouse.Y, MouseButton.Left, true));
+				}
+			}
+
 			updateTime.Restart ();
 			layoutTime.Reset ();
 			guTime.Reset ();
@@ -295,19 +285,20 @@ namespace Crow
 			foreach (GraphicObject p in gotr) {
 				p.registerClipRect ();
 			}
+			updateTime.Stop ();
 
+			drawingTime.Start ();
 
 			lock (redrawClip) {
 				if (redrawClip.count > 0) {					
-//					#if DEBUG_CLIP_RECTANGLE
-//					redrawClip.stroke (ctx, new Color(1.0,0,0,0.3));
-//					#endif
+					#if DEBUG_CLIP_RECTANGLE
+					redrawClip.stroke (ctx, new Color(1.0,0,0,0.3));
+					#endif
 					redrawClip.clearAndClip (ctx);//rajouté après, tester si utile	
 
 					//Link.draw (ctx);
 					foreach (GraphicObject p in invGOList) {
 						if (p.Visible) {
-							drawingTime.Start ();
 
 							ctx.Save ();
 							if (redrawClip.count > 0) {
@@ -317,18 +308,16 @@ namespace Crow
 									p.Paint (ref ctx, clip);
 							}
 							ctx.Restore ();
-
-							drawingTime.Stop ();
 						}
 					}
 					ctx.ResetClip ();
-					dirtyZone = redrawClip.Bounds;
-//					#if DEBUG_CLIP_RECTANGLE
-//					redrawClip.stroke (ctx, Color.Red.AdjustAlpha(0.1));
-//					#endif
+					#if DEBUG_CLIP_RECTANGLE
+					redrawClip.stroke (ctx, Color.Red.AdjustAlpha(0.1));
+					#endif
 					redrawClip.Reset ();
 				}
 			}
+			drawingTime.Stop ();
 			//surf.WriteToPng (@"/mnt/data/test.png");
 			ctx.Dispose ();
 			surf.Dispose ();
@@ -345,7 +334,7 @@ namespace Crow
 //			    layoutTime.ElapsedMilliseconds,
 //			    guTime.ElapsedMilliseconds,
 //			    drawingTime.ElapsedMilliseconds);
-			updateTime.Stop ();
+
 //			Debug.WriteLine("UPDATE: {0} ticks \t, {1} ms",
 //				updateTime.ElapsedTicks,
 //				updateTime.ElapsedMilliseconds);
@@ -428,7 +417,7 @@ namespace Crow
         {
 			if (_activeWidget != null) {
 				//first, ensure object is still in the graphic tree
-				if (_activeWidget.TopContainer == null) {
+				if (_activeWidget.HostContainer == null) {
 					activeWidget = null;
 				} else {
 					
@@ -440,7 +429,7 @@ namespace Crow
 
 			if (_hoverWidget != null) {
 				//first, ensure object is still in the graphic tree
-				if (_hoverWidget.TopContainer == null) {
+				if (_hoverWidget.HostContainer == null) {
 					hoverWidget = null;
 				} else {
 					//check topmost graphicobject first
@@ -500,9 +489,15 @@ namespace Crow
 				MouseButtonUp.Raise (this, e);
 				return;
 			}
+				
+			if (mouseRepeatThread != null) {
+				mouseRepeatOn = false;
+				mouseRepeatThread.Abort();
+				mouseRepeatThread.Join ();
+			}
 
-			_activeWidget.onMouseButtonUp (this, e);
-			_activeWidget = null;
+			_activeWidget.onMouseUp (this, e);
+			activeWidget = null;
         }
         void Mouse_ButtonDown(object sender, MouseButtonEventArgs e)
         {
@@ -511,18 +506,15 @@ namespace Crow
 				return;
 			}
 
-			GraphicObject g = _hoverWidget;
-			while (!g.Focusable) {				
-				g = g.Parent as GraphicObject;
-				if (g == null) {					
-					return;
-				}
-			}
+			_hoverWidget.onMouseDown(_hoverWidget,new BubblingMouseButtonEventArg(e));
 
-			_activeWidget = g;
-			_activeWidget.onMouseButtonDown (this, e);
+			if (FocusedWidget == null)
+				return;
+			if (!FocusedWidget.MouseRepeat)
+				return;
+			mouseRepeatThread = new Thread (mouseRepeatThreadFunc);
+			mouseRepeatThread.Start ();
         }
-
         void Mouse_WheelChanged(object sender, MouseWheelEventArgs e)
         {
 			if (_hoverWidget == null) {
@@ -530,7 +522,21 @@ namespace Crow
 				return;
 			}
 			_hoverWidget.onMouseWheel (this, e);
-        }        
+        }
+
+		volatile bool mouseRepeatOn;
+		volatile int mouseRepeatCount;
+		Thread mouseRepeatThread;
+		void mouseRepeatThreadFunc()
+		{
+			mouseRepeatOn = true;
+			Thread.Sleep (Interface.DeviceRepeatDelay);
+			while (mouseRepeatOn) {
+				mouseRepeatCount++;
+				Thread.Sleep (Interface.DeviceRepeatInterval);
+			}
+			mouseRepeatCount = 0;
+		}
 		#endregion
 
         #region keyboard Handling
@@ -566,7 +572,7 @@ namespace Crow
 		Rectangle ILayoutable.ClientRectangle {
 			get { return new Size(this.ClientRectangle.Size.Width,this.ClientRectangle.Size.Height); }
 		}
-		public IGOLibHost TopContainer {
+		public IGOLibHost HostContainer {
 			get { return this; }
 		}
 
diff --git a/src/Picture.cs b/src/Picture.cs
index 99be57bb..c1d83061 100644
--- a/src/Picture.cs
+++ b/src/Picture.cs
@@ -29,7 +29,7 @@ namespace Crow
 		public string Path;
 		public Size Dimensions;
 		public bool KeepProportions = false;
-		public bool Scale = true;
+		public bool Scaled = true;
 
 		public Picture ()
 		{
diff --git a/src/SvgPicture.cs b/src/SvgPicture.cs
index 94230311..cbe6f2e8 100644
--- a/src/SvgPicture.cs
+++ b/src/SvgPicture.cs
@@ -45,20 +45,26 @@ namespace Crow
 			
 		public override void Paint (Cairo.Context gr, Rectangle rect, string subPart = "")
 		{
-			float widthRatio = (float)rect.Width / Dimensions.Width;
-			float heightRatio = (float)rect.Height / Dimensions.Height;
-			float ratio = Math.Min (widthRatio, heightRatio);
-
-			Rectangle rImg = rect;
+			float widthRatio = 1f;
+			float heightRatio = 1f;
 
+			if (Scaled) {
+				widthRatio = (float)rect.Width / Dimensions.Width;
+				heightRatio = (float)rect.Height / Dimensions.Height;
+			}
+			if (KeepProportions) {
+				if (widthRatio < heightRatio)
+					heightRatio = widthRatio;
+				else
+					widthRatio = heightRatio;
+			}
+				
 			gr.Save ();
 
-			if (KeepProportions)
-				gr.Scale (ratio, ratio);
-			else
-				gr.Scale (widthRatio, heightRatio);
+			gr.Translate (rect.Left,rect.Top);
+			gr.Scale (widthRatio, heightRatio);
+			gr.Translate (((float)rect.Width/widthRatio - Dimensions.Width)/2f, ((float)rect.Height/heightRatio - Dimensions.Height)/2f);
 
-			gr.Translate (rImg.X/widthRatio, rImg.Y/heightRatio);
 			if (string.IsNullOrEmpty (subPart))
 				hSVG.RenderCairo (gr);
 			else
-- 
2.47.3