diff --git a/resources/menu.php b/resources/menu.php
index 079cffdb90..1e686fb957 100644
--- a/resources/menu.php
+++ b/resources/menu.php
@@ -68,38 +68,6 @@ require_once "resources/require.php";
 		$v_menu .= $menu->build_html("", "main");
 		unset($menu);
 
-		if ($_SESSION['theme']['gtranslate']['var'] == 'true'){
-
-			$v_menu .= "<!-- GTranslate: http://gtranslate.net/ -->
-
-<style type='text/css'>
-<!--
-a.gflag {vertical-align:middle;font-size:16px;padding:1px 0;background-repeat:no-repeat;background-image:url('http://joomla-gtranslate.googlecode.com/svn/trunk/mod_gtranslate/tmpl/lang/16.png');}
-a.gflag img {border:0;}
-a.gflag:hover {background-image:url('http://joomla-gtranslate.googlecode.com/svn/trunk/mod_gtranslate/tmpl/lang/16a.png');}
-#goog-gt-tt {display:none !important;}
-.goog-te-banner-frame {display:none !important;}
-.goog-te-menu-value:hover {text-decoration:none !important;}
-body {top:0 !important;}
-#google_translate_element2 {display:none!important;}
--->
-</style>
-
-<br /><select onchange='doGTranslate(this);'><option value=''>Select Language</option><option value='en|af'>Afrikaans</option><option value='en|sq'>Albanian</option><option value='en|ar'>Arabic</option><option value='en|hy'>Armenian</option><option value='en|az'>Azerbaijani</option><option value='en|eu'>Basque</option><option value='en|be'>Belarusian</option><option value='en|bg'>Bulgarian</option><option value='en|ca'>Catalan</option><option value='en|zh-CN'>Chinese (Simplified)</option><option value='en|zh-TW'>Chinese (Traditional)</option><option value='en|hr'>Croatian</option><option value='en|cs'>Czech</option><option value='en|da'>Danish</option><option value='en|nl'>Dutch</option><option value='en|en'>English</option><option value='en|et'>Estonian</option><option value='en|tl'>Filipino</option><option value='en|fi'>Finnish</option><option value='en|fr'>French</option><option value='en|gl'>Galician</option><option value='en|ka'>Georgian</option><option value='en|de'>German</option><option value='en|el'>Greek</option><option value='en|ht'>Haitian Creole</option><option value='en|iw'>Hebrew</option><option value='en|hi'>Hindi</option><option value='en|hu'>Hungarian</option><option value='en|is'>Icelandic</option><option value='en|id'>Indonesian</option><option value='en|ga'>Irish</option><option value='en|it'>Italian</option><option value='en|ja'>Japanese</option><option value='en|ko'>Korean</option><option value='en|lv'>Latvian</option><option value='en|lt'>Lithuanian</option><option value='en|mk'>Macedonian</option><option value='en|ms'>Malay</option><option value='en|mt'>Maltese</option><option value='en|no'>Norwegian</option><option value='en|fa'>Persian</option><option value='en|pl'>Polish</option><option value='en|pt'>Portuguese</option><option value='en|ro'>Romanian</option><option value='en|ru'>Russian</option><option value='en|sr'>Serbian</option><option value='en|sk'>Slovak</option><option value='en|sl'>Slovenian</option><option value='en|es'>Spanish</option><option value='en|sw'>Swahili</option><option value='en|sv'>Swedish</option><option value='en|th'>Thai</option><option value='en|tr'>Turkish</option><option value='en|uk'>Ukrainian</option><option value='en|ur'>Urdu</option><option value='en|vi'>Vietnamese</option><option value='en|cy'>Welsh</option><option value='en|yi'>Yiddish</option></select><div id='google_translate_element2'></div>
-<script type='text/javascript'>
-function googleTranslateElementInit2() {new google.translate.TranslateElement({pageLanguage: 'en',autoDisplay: false}, 'google_translate_element2');}
-</script><script type='text/javascript' src='http://translate.google.com/translate_a/element.js?cb=googleTranslateElementInit2'></script>
-
-
-<script type='text/javascript'>
-/* <![CDATA[ */
-eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('6 7(a,b){n{4(2.9){3 c=2.9('o');c.p(b,f,f);a.q(c)}g{3 c=2.r();a.s(\'t\'+b,c)}}u(e){}}6 h(a){4(a.8)a=a.8;4(a==\'\')v;3 b=a.w(\'|\')[1];3 c;3 d=2.x(\'y\');z(3 i=0;i<d.5;i++)4(d[i].A==\'B-C-D\')c=d[i];4(2.j(\'k\')==E||2.j(\'k\').l.5==0||c.5==0||c.l.5==0){F(6(){h(a)},G)}g{c.8=b;7(c,\'m\');7(c,\'m\')}}',43,43,'||document|var|if|length|function|GTranslateFireEvent|value|createEvent||||||true|else|doGTranslate||getElementById|google_translate_element2|innerHTML|change|try|HTMLEvents|initEvent|dispatchEvent|createEventObject|fireEvent|on|catch|return|split|getElementsByTagName|select|for|className|goog|te|combo|null|setTimeout|500'.split('|'),0,{}))
-/* ]]> */
-</script>
-<script type='text/javascript' src='http://joomla-gtranslate.googlecode.com/svn/trunk/gt_update_notes0.js'></script>
-
-";
-		}
 		$v_menu .= "</div>\n";
 		$_SESSION["menu"] = $v_menu;
 	}
diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php
index 25518e1207..5b05c8927a 100644
--- a/themes/enhanced/template.php
+++ b/themes/enhanced/template.php
@@ -1330,8 +1330,41 @@ if (strlen($_SESSION['message']) > 0) {
 					</tr>
 					<tr>
 						<td class='menu_bar' height='30px'>
+
 							<!--{menu}-->
-						</td>
+<?php 
+				if ($_SESSION['theme']['gtranslate']['var'] == 'true'){  ?>
+<!-- GTranslate: http://gtranslate.net/ -->
+
+<style type="text/css">
+<!--
+a.gflag {vertical-align:middle;font-size:16px;padding:1px 0;background-repeat:no-repeat;background-image:url('http://joomla-gtranslate.googlecode.com/svn/trunk/mod_gtranslate/tmpl/lang/16.png');}
+a.gflag img {border:0;}
+a.gflag:hover {background-image:url('http://joomla-gtranslate.googlecode.com/svn/trunk/mod_gtranslate/tmpl/lang/16a.png');}
+#goog-gt-tt {display:none !important;}
+.goog-te-banner-frame {display:none !important;}
+.goog-te-menu-value:hover {text-decoration:none !important;}
+body {top:0 !important;}
+#google_translate_element2 {display:none!important;}
+-->
+</style>
+
+ <select onchange="doGTranslate(this);"><option value="">Select Language</option><option value="en|af">Afrikaans</option><option value="en|sq">Albanian</option><option value="en|ar">Arabic</option><option value="en|hy">Armenian</option><option value="en|az">Azerbaijani</option><option value="en|eu">Basque</option><option value="en|be">Belarusian</option><option value="en|bg">Bulgarian</option><option value="en|ca">Catalan</option><option value="en|zh-CN">Chinese (Simplified)</option><option value="en|zh-TW">Chinese (Traditional)</option><option value="en|hr">Croatian</option><option value="en|cs">Czech</option><option value="en|da">Danish</option><option value="en|nl">Dutch</option><option value="en|en">English</option><option value="en|et">Estonian</option><option value="en|tl">Filipino</option><option value="en|fi">Finnish</option><option value="en|fr">French</option><option value="en|gl">Galician</option><option value="en|ka">Georgian</option><option value="en|de">German</option><option value="en|el">Greek</option><option value="en|ht">Haitian Creole</option><option value="en|iw">Hebrew</option><option value="en|hi">Hindi</option><option value="en|hu">Hungarian</option><option value="en|is">Icelandic</option><option value="en|id">Indonesian</option><option value="en|ga">Irish</option><option value="en|it">Italian</option><option value="en|ja">Japanese</option><option value="en|ko">Korean</option><option value="en|lv">Latvian</option><option value="en|lt">Lithuanian</option><option value="en|mk">Macedonian</option><option value="en|ms">Malay</option><option value="en|mt">Maltese</option><option value="en|no">Norwegian</option><option value="en|fa">Persian</option><option value="en|pl">Polish</option><option value="en|pt">Portuguese</option><option value="en|ro">Romanian</option><option value="en|ru">Russian</option><option value="en|sr">Serbian</option><option value="en|sk">Slovak</option><option value="en|sl">Slovenian</option><option value="en|es">Spanish</option><option value="en|sw">Swahili</option><option value="en|sv">Swedish</option><option value="en|th">Thai</option><option value="en|tr">Turkish</option><option value="en|uk">Ukrainian</option><option value="en|ur">Urdu</option><option value="en|vi">Vietnamese</option><option value="en|cy">Welsh</option><option value="en|yi">Yiddish</option></select><div id="google_translate_element2"></div>
+<script type="text/javascript">
+function googleTranslateElementInit2() {new google.translate.TranslateElement({pageLanguage: 'en',autoDisplay: false}, 'google_translate_element2');}
+</script><script type="text/javascript" src="http://translate.google.com/translate_a/element.js?cb=googleTranslateElementInit2"></script>
+
+
+<script type="text/javascript">
+/* <![CDATA[ */
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('6 7(a,b){n{4(2.9){3 c=2.9("o");c.p(b,f,f);a.q(c)}g{3 c=2.r();a.s(\'t\'+b,c)}}u(e){}}6 h(a){4(a.8)a=a.8;4(a==\'\')v;3 b=a.w(\'|\')[1];3 c;3 d=2.x(\'y\');z(3 i=0;i<d.5;i++)4(d[i].A==\'B-C-D\')c=d[i];4(2.j(\'k\')==E||2.j(\'k\').l.5==0||c.5==0||c.l.5==0){F(6(){h(a)},G)}g{c.8=b;7(c,\'m\');7(c,\'m\')}}',43,43,'||document|var|if|length|function|GTranslateFireEvent|value|createEvent||||||true|else|doGTranslate||getElementById|google_translate_element2|innerHTML|change|try|HTMLEvents|initEvent|dispatchEvent|createEventObject|fireEvent|on|catch|return|split|getElementsByTagName|select|for|className|goog|te|combo|null|setTimeout|500'.split('|'),0,{}))
+/* ]]> */
+</script>
+<script type="text/javascript" src="http://joomla-gtranslate.googlecode.com/svn/trunk/gt_update_notes0.js"></script>
+<?php
+				}
+?>	
+</td>
 					</tr>
 					<tr>
 						<td height='9px'><img src='<!--{project_path}-->/themes/enhanced/images/blank.gif'></td>
@@ -1342,6 +1375,7 @@ if (strlen($_SESSION['message']) > 0) {
 				<tr>
 					<td valign='top' align='center' width='100%'>
 						<table cellpadding='0' cellspacing='1' border='0' width='100%' style='margin-bottom: 60px;'>
+
 							<tr>
 								<td class='main_content' valign='top' align='center'>
 									<!--{body}-->