diff --git a/components/common.less b/components/common.less
index a49a8d3..27b2526 100644
--- a/components/common.less
+++ b/components/common.less
@@ -34,8 +34,6 @@ body {
 	/* Border on top, left, and bottom side */
 	border: 1px solid @content-border-color;
 	border-right-width: 0;
-	/* Merge the border with tabs' one (in their background image) */
-	margin-top: 60px;
 
 	// h1's can exist outside of mw-body-content so some heading styles
 	// need to be defined in mw-body as well
diff --git a/includes/VectorTemplate.php b/includes/VectorTemplate.php
index a45e1eb..51e2ab6 100644
--- a/includes/VectorTemplate.php
+++ b/includes/VectorTemplate.php
@@ -56,6 +56,21 @@ class VectorTemplate extends BaseTemplate {
         $this->html( 'headelement' );
         ?>
 
+        <!-- GOLEM Navigation Bar -- BEGIN -->
+        <div id="golemnavbar">
+            <div id="golemnavbarlinks">
+                <ul>
+                    <li id="golemmotto">I computer sceglierebbero Linux &#x1f427;</li>
+                    <li><a href="http://golem.linux.it/">Home</a></li>
+                    <li><a href="http://golem.linux.it/wiki/Chi_siamo">Chi siamo</a></li>
+                    <li><a href="http://golem.linux.it/wp/contatti/">Contatti</a></li>
+                    <li><a href="http://golem.linux.it/wiki/">Wiki</a></li>
+                    <li><a href="http://golem.linux.it/wiki/Recupero_Hardware">Recupero Hardware</a></li>
+                </ul>
+            </div>
+        </div>
+        <!-- GOLEM Navigation Bar -- END -->
+
 		<div id="content" class="mw-body" role="main">
 			<a id="top"></a>
 			<?php
@@ -149,20 +164,6 @@ class VectorTemplate extends BaseTemplate {
 		<div id="mw-navigation">
 			<h2><?php $this->msg( 'navigation-heading' ) ?></h2>
             <div id="mw-head">
-        <!-- GOLEM Navigation Bar -- BEGIN -->
-        <div id="golemnavbar">
-            <div id="golemnavbarlinks">
-                <ul>
-                    <li id="golemmotto">I computer sceglierebbero Linux &#x1f427;</li>
-                    <li><a href="http://golem.linux.it/">Home</a></li>
-                    <li><a href="http://golem.linux.it/wiki/Chi_siamo">Chi siamo</a></li>
-                    <li><a href="http://golem.linux.it/wp/contatti/">Contatti</a></li>
-                    <li><a href="http://golem.linux.it/wiki/">Wiki</a></li>
-                    <li><a href="http://golem.linux.it/wiki/Recupero_Hardware">Recupero Hardware</a></li>
-                </ul>
-            </div>
-        </div>
-        <!-- GOLEM Navigation Bar -- END -->
 
 			</div>
             <div id="mw-panel">