diff --git a/src/App.vue b/src/App.vue
index f128ab6..5044bf4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,15 +42,18 @@ watch(colorScheme, val => updateColorScheme(val))
 </template>
 
 <style scoped>
-.main-content {
+#app-wrapper {
     --main-content-padding-x: 30px;
     --main-content-padding-y: 40px;
     --main-content-padding: var(--main-content-padding-y) var(--main-content-padding-x);
+}
+
+.main-content {
     flex-grow: 1;
 }
 
 @media (max-width: 48rem) {
-    .main-content {
+    #app-wrapper {
         --main-content-padding-x: 15px;
     }
 }
diff --git a/src/features/nav/components/Navbar.vue b/src/features/nav/components/Navbar.vue
index 08f5855..387db51 100644
--- a/src/features/nav/components/Navbar.vue
+++ b/src/features/nav/components/Navbar.vue
@@ -42,7 +42,7 @@ import NavbarSearchBarWrapper from './NavbarSearchBarWrapper.vue';
     display: flex;
     justify-content: space-between;
     align-items: center;
-    padding: 18px 40px;
+    padding: 18px var(--main-content-padding-x);
     height: 42px;
 }
 
diff --git a/src/utils/__tests__/LanguageSwitchButton.test.js b/src/utils/__tests__/LanguageSwitchButton.test.js
new file mode 100644
index 0000000..add624c
--- /dev/null
+++ b/src/utils/__tests__/LanguageSwitchButton.test.js
@@ -0,0 +1,114 @@
+/*
+Copyright 2026 Seekra
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { expect, test, describe, vi, beforeEach } from 'vitest';
+import { mount } from '@vue/test-utils';
+import LanguageSwitchButton from '../LanguageSwitchButton.vue';
+import { loadLanguage } from '@/i18n';
+
+vi.mock('@/i18n', () => ({
+    loadLanguage: vi.fn(() => Promise.resolve()),
+    LANGUAGES_RTL: ['ar', 'he'],
+    SUPPORTED_LANGUAGES: ['en', 'de', 'ar']
+}));
+
+vi.mock('vue-i18n', () => ({
+    useI18n: () => ({
+        t: (key) => key,
+        locale: { value: 'de' }
+    })
+}));
+
+vi.mock('@/features/icons/components/Icon.vue', () => ({
+    default: {
+        name: 'Icon',
+        template: '<span>Icon</span>'
+    }
+}));
+
+describe('LanguageSwitchButton.vue', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        localStorage.clear();
+        document.documentElement.lang = '';
+        document.documentElement.dir = '';
+    });
+
+    test('renders correctly with initial state closed', () => {
+        const wrapper = mount(LanguageSwitchButton);
+        
+        expect(wrapper.find('.language-button').exists()).toBe(true);
+        expect(wrapper.find('.language-dropdown').exists()).toBe(false);
+        expect(wrapper.find('.language-button').attributes('aria-expanded')).toBe('false');
+    });
+
+    test('opens the dropdown when language button is clicked', async () => {
+        const wrapper = mount(LanguageSwitchButton);
+        const button = wrapper.find('.language-button');
+        
+        await button.trigger('click');
+        
+        expect(wrapper.find('.language-dropdown').exists()).toBe(true);
+        expect(button.attributes('aria-expanded')).toBe('true');
+    });
+
+    const languageTestCases = [
+        { code: 'en', expectedDir: 'ltr' },
+        { code: 'de', expectedDir: 'ltr' },
+        { code: 'ar', expectedDir: 'rtl' }
+    ];
+
+    test.for(languageTestCases)('selectLanguage($code) sets localStorage, html attributes and changes layout direction to $expectedDir', async ({ code, expectedDir }) => {
+        const wrapper = mount(LanguageSwitchButton);
+        
+        await wrapper.find('.language-button').trigger('click');
+        
+        const options = wrapper.findAll('.language-dropdown li');
+        const optionToClick = options.find(opt => opt.text().includes(code));
+        
+        await optionToClick.trigger('click');
+
+        expect(loadLanguage).toHaveBeenCalledWith(code);
+        expect(localStorage.getItem('locale')).toBe(code);
+        expect(document.documentElement.lang).toBe(code);
+        expect(document.documentElement.dir).toBe(expectedDir);
+        expect(wrapper.find('.language-dropdown').exists()).toBe(false);
+    });
+
+    test('closes the dropdown when clicking outside the component', async () => {
+        const wrapper = mount(LanguageSwitchButton, {
+            attachTo: document.body
+        });
+
+        await wrapper.find('.language-button').trigger('click');
+        expect(wrapper.find('.language-dropdown').exists()).toBe(true);
+
+        await new Promise(resolve => setTimeout(resolve, 0));
+
+        const externalDiv = document.createElement('div');
+        document.body.appendChild(externalDiv);
+        
+        const clickEvent = new MouseEvent('click', { bubbles: true });
+        externalDiv.dispatchEvent(clickEvent);
+        
+        await wrapper.vm.$nextTick();
+
+        expect(wrapper.find('.language-dropdown').exists()).toBe(false);
+
+        wrapper.unmount();
+        externalDiv.remove();
+    });
+});
\ No newline at end of file
diff --git a/src/views/SearchView.vue b/src/views/SearchView.vue
index d2aff82..6a5df4c 100644
--- a/src/views/SearchView.vue
+++ b/src/views/SearchView.vue
@@ -67,9 +67,10 @@ const submitSearch = function () {
     max-width: 100%;
 }
 
-.slogan{
-    margin: 0;
+.slogan {
+    margin-top: 1rem;
     font-size: small;
+    line-height: normal;
 }
 
 .search-container {