diff --git a/chameleon_layout.xml b/chameleon_layout.xml
index 0b50c15..570f736 100644
--- a/chameleon_layout.xml
+++ b/chameleon_layout.xml
@@ -26,32 +26,20 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
 <structure xmlns="https://ProfessionalWiki.github.io/chameleon/schema/3.6/layout.rng">
 	<grid class="flex-fill">
 		<row>
-			<cell class="flex-grow-0">
-				<component type="Logo" addLink="yes"/>
-			</cell>
-
-			<cell class="ml-auto col-12 col-cmln">
-
-				<row>
-					<cell>
-						<component type="PersonalTools" hideNewtalkNotifier="yes" class="pull-right"/>
-					</cell>
-				</row>
-
-				<row>
-					<cell>
-						<component type="SearchBar" buttons="go" class="pull-right"/>
-					</cell>
-				</row>
-
+			<cell class="ml-auto col-cmln">
+				<component type="PersonalTools" hideNewtalkNotifier="yes" class="pull-right"/>
 			</cell>
 		</row>
 
 		<row>
+			<cell class="flex-grow-0">
+				<component type="Logo" addLink="yes"/>
+			</cell>
 			<cell>
 				<component type="NavbarHorizontal" class="mb-3 mt-2 mt-cmln-0">
 					<component type="NavMenu"/>
 					<component type="Menu" message="secondary-menu"/>
+					<component type="SearchBar" buttons="go" class="pull-right" position="right" class="order-first order-cmln-0"/>
 				</component>
 			</cell>
 		</row>