diff --git a/app/other/MakeWebSite/.src/MTranslation.module b/app/other/MakeWebSite/.src/MTranslation.module
index 557b90bb6..c5e767105 100644
--- a/app/other/MakeWebSite/.src/MTranslation.module
+++ b/app/other/MakeWebSite/.src/MTranslation.module
@@ -10,8 +10,6 @@ Public Sub Load()
   $cTr["<b><i>Gambas</i></b> is a free development environment based on a <i>Basic</i> interpreter with object extensions, a bit like <i>Visual Basic&#8482;</i> (but it is <i><b>NOT</b></i> a clone&nbsp;!)."] = ("<b><i>Gambas</i></b> is a free development environment based on a <i>Basic</i> interpreter with object extensions, a bit like <i>Visual Basic&#8482;</i> (but it is <i><b>NOT</b></i> a clone&nbsp;!).")
   $cTr["Read the <a href=\"http://gambasdoc.org/help/doc/intro?view&$(LANG)\">introduction</a> for more information."] = ("Read the <a href=\"http://gambasdoc.org/help/doc/intro?view&$(LANG)\">introduction</a> for more information.")
   $cTr["With <b><i>Gambas</i></b>, you can quickly design your program GUI with QT4 or GTK+, access MySQL, PostgreSQL, ODBC and SQLite databases, pilot applications with <i>D-Bus</i>, translate your program into any language, create network applications easily, make 3D OpenGL applications, make CGI web applications, and so on..."] = ("With <b><i>Gambas</i></b>, you can quickly design your program GUI with QT4 or GTK+, access MySQL, PostgreSQL, ODBC and SQLite databases, pilot applications with <i>D-Bus</i>, translate your program into any language, create network applications easily, make 3D OpenGL applications, make CGI web applications, and so on...")
-  $cTr["You can support <b><i>Gambas</i></b> by making a small donation with"] = ("You can support <b><i>Gambas</i></b> by making a small donation with")
-  $cTr["or by using"] = ("or by using")
   $cTr["The greatest formula of the world!"] = ("The greatest formula of the world!")
   $cTr["Click there to see all news"] = ("Click there to see all news")
   $cTr["Last news"] = ("Last news")
@@ -19,6 +17,8 @@ Public Sub Load()
   $cTr["Release Notes"] = ("Release Notes")
   $cTr["Donate with PayPal"] = ("Donate with PayPal")
   $cTr["Flattr this"] = ("Flattr this")
+  $cTr["You can support <b><i>Gambas</i></b> by making a small donation with"] = ("You can support <b><i>Gambas</i></b> by making a small donation with")
+  $cTr["or by using"] = ("or by using")
   $cTr["Hall Of Fame"] = ("Hall Of Fame")
   $cTr["Developers"] = ("Developers")
   $cTr["Developer"] = ("Developer")
diff --git a/app/other/MakeWebSite/gambas.sourceforge.net/home.html b/app/other/MakeWebSite/gambas.sourceforge.net/home.html
index 6bf794790..b0210f60c 100644
--- a/app/other/MakeWebSite/gambas.sourceforge.net/home.html
+++ b/app/other/MakeWebSite/gambas.sourceforge.net/home.html
@@ -21,17 +21,15 @@
     <div id="title">Gambas Almost Means BASIC !</div>
     <!--<div id="title-shadow">Gambas Almost Means BASIC !</div>-->
     
+    <div>
+    
     {<b><i>Gambas</i></b> is a free development environment based on a <i>Basic</i> interpreter with object extensions, a bit like <i>Visual Basic&#8482;</i> (but it is <i><b>NOT</b></i> a clone&nbsp;!).}
     {Read the <a href="http://gambasdoc.org/help/doc/intro?view&$(LANG)">introduction</a> for more information.}
-    <br><br>
-    {With <b><i>Gambas</i></b>, you can quickly design your program GUI with QT4 or GTK+, access MySQL, PostgreSQL, ODBC and SQLite databases, pilot applications with <i>D-Bus</i>, translate your program into any language, create network applications easily, make 3D OpenGL applications, make CGI web applications, and so on...}
+    <!--{With <b><i>Gambas</i></b>, you can quickly design your program GUI with QT4 or GTK+, access MySQL, PostgreSQL, ODBC and SQLite databases, pilot applications with <i>D-Bus</i>, translate your program into any language, create network applications easily, make 3D OpenGL applications, make CGI web applications, and so on...}
   
-    <p>
-    <i>{You can support <b><i>Gambas</i></b> by making a small donation with}
-    <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=WL75JG57SMDE6" target="_blank">PayPal</a>
-    {or by using}
-    <a href="http://flattr.com/thing/93635/Gambas" target="_blank">Flattr</a>.
-    </i>
+    <p>-->
+    
+    </div>
     
     <!--<table class="none" cellspacing="0" cellpadding="0" border="0" style="margin-top:16px;">
     <tr valign="top">
@@ -88,6 +86,13 @@
       <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="{Flattr this}" title="{Flattr this}" align="center">
     </a>
     
+    <div style="font-size:small;max-width:16em;margin-top:16px;">
+    {You can support <b><i>Gambas</i></b> by making a small donation with}
+    <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=WL75JG57SMDE6" target="_blank">PayPal</a>
+    {or by using}
+    <a href="http://flattr.com/thing/93635/Gambas" target="_blank">Flattr</a>.
+    </div>
+    
   </div>
       
 </td></tr>
diff --git a/app/other/MakeWebSite/gambas.sourceforge.net/home.html.template b/app/other/MakeWebSite/gambas.sourceforge.net/home.html.template
index 7b37939bb..0619fc9ad 100644
--- a/app/other/MakeWebSite/gambas.sourceforge.net/home.html.template
+++ b/app/other/MakeWebSite/gambas.sourceforge.net/home.html.template
@@ -21,17 +21,15 @@
     <div id="title">Gambas Almost Means BASIC !</div>
     <!--<div id="title-shadow">Gambas Almost Means BASIC !</div>-->
     
+    <div>
+    
     {<b><i>Gambas</i></b> is a free development environment based on a <i>Basic</i> interpreter with object extensions, a bit like <i>Visual Basic&#8482;</i> (but it is <i><b>NOT</b></i> a clone&nbsp;!).}
     {Read the <a href="http://gambasdoc.org/help/doc/intro?view&$(LANG)">introduction</a> for more information.}
-    <br><br>
-    {With <b><i>Gambas</i></b>, you can quickly design your program GUI with QT4 or GTK+, access MySQL, PostgreSQL, ODBC and SQLite databases, pilot applications with <i>D-Bus</i>, translate your program into any language, create network applications easily, make 3D OpenGL applications, make CGI web applications, and so on...}
+    <!--{With <b><i>Gambas</i></b>, you can quickly design your program GUI with QT4 or GTK+, access MySQL, PostgreSQL, ODBC and SQLite databases, pilot applications with <i>D-Bus</i>, translate your program into any language, create network applications easily, make 3D OpenGL applications, make CGI web applications, and so on...}
   
-    <p>
-    <i>{You can support <b><i>Gambas</i></b> by making a small donation with}
-    <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=WL75JG57SMDE6" target="_blank">PayPal</a>
-    {or by using}
-    <a href="http://flattr.com/thing/93635/Gambas" target="_blank">Flattr</a>.
-    </i>
+    <p>-->
+    
+    </div>
     
     <!--<table class="none" cellspacing="0" cellpadding="0" border="0" style="margin-top:16px;">
     <tr valign="top">
@@ -88,6 +86,13 @@
       <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="{Flattr this}" title="{Flattr this}" align="center">
     </a>
     
+    <div style="font-size:small;max-width:16em;margin-top:16px;">
+    {You can support <b><i>Gambas</i></b> by making a small donation with}
+    <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=WL75JG57SMDE6" target="_blank">PayPal</a>
+    {or by using}
+    <a href="http://flattr.com/thing/93635/Gambas" target="_blank">Flattr</a>.
+    </div>
+    
   </div>
       
 </td></tr>
diff --git a/main/lib/draw/CDraw.c b/main/lib/draw/CDraw.c
index 3b5863bd9..f4ce3ca4a 100644
--- a/main/lib/draw/CDraw.c
+++ b/main/lib/draw/CDraw.c
@@ -825,8 +825,6 @@ BEGIN_METHOD(CDRAW_picture, GB_OBJECT picture; GB_INTEGER x; GB_INTEGER y; GB_IN
 	y = VARGOPT(y, 0);
 	w = VARGOPT(w, info.width);
 	h = VARGOPT(h, info.height);
-	w = VARGOPT(w, -1);
-	h = VARGOPT(h, -1);
 
 	if (THIS->xform)
 		MATRIX_map_rect(THIS_MATRIX, &x, &y, &w, &h);