diff --git a/templates/page.tmpl b/templates/page.tmpl
index 0f0e68f..619d955 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -49,8 +49,33 @@
 	    </ul>
       </div>
 
+<TMPL_IF SEARCHFORM>
+<TMPL_VAR SEARCHFORM>
+</TMPL_IF>
 
-<div class="btn-group">
+<TMPL_IF OTHERLANGUAGES>
+<TMPL_IF HTML5><nav id="otherlanguages"><TMPL_ELSE><div id="otherlanguages"></TMPL_IF>
+<ul>
+<TMPL_LOOP OTHERLANGUAGES>
+<li>
+<a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a>
+<TMPL_IF MASTER>
+(master)
+<TMPL_ELSE>
+&nbsp;(<TMPL_VAR PERCENT>%)
+</TMPL_IF>
+</li>
+</TMPL_LOOP>
+</ul>
+</TMPL_IF>
+
+<TMPL_VAR TRAILS>
+
+<div class="container">
+
+
+
+  <div class="btn-group pull-right">
 	<TMPL_IF HAVE_ACTIONS>
 	  <TMPL_IF EDITURL>
 		<a class="btn" href="<TMPL_VAR EDITURL>" rel="nofollow"><i class="icon-edit"></i></a>
@@ -82,32 +107,7 @@
 	</TMPL_IF>
   </div>
 
-
-<TMPL_IF SEARCHFORM>
-<TMPL_VAR SEARCHFORM>
-</TMPL_IF>
-
-<TMPL_IF OTHERLANGUAGES>
-<TMPL_IF HTML5><nav id="otherlanguages"><TMPL_ELSE><div id="otherlanguages"></TMPL_IF>
-<ul>
-<TMPL_LOOP OTHERLANGUAGES>
-<li>
-<a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a>
-<TMPL_IF MASTER>
-(master)
-<TMPL_ELSE>
-&nbsp;(<TMPL_VAR PERCENT>%)
-</TMPL_IF>
-</li>
-</TMPL_LOOP>
-</ul>
-</TMPL_IF>
-
-<TMPL_VAR TRAILS>
-
-<div class="container">
-
-  <TMPL_IF SIDEBAR>
+<TMPL_IF SIDEBAR>
     <div class="row">
       <div class="span10">
   </TMPL_IF>