diff --git a/index.html b/index.html
index 09f72d1..fb57a59 100644
--- a/index.html
+++ b/index.html
@@ -61,10 +61,10 @@
                         <span class="subtitle">Kuituasiakkaiden hallinta</span>
                     </div>
                 </div>
-                <select id="company-selector" class="company-selector" style="display:none;"></select>
             </div>
             <div class="header-right">
                 <span id="user-info" class="user-info"></span>
+                <select id="company-selector" class="company-selector" style="display:none;"></select>
                 <button id="btn-users" class="btn-secondary" style="display:none">Käyttäjät</button>
                 <button id="btn-companies" class="btn-secondary" style="display:none">Yritykset</button>
                 <button id="btn-add" class="btn-primary">+ Lisää asiakas</button>
diff --git a/style.css b/style.css
index e310db1..d12a551 100644
--- a/style.css
+++ b/style.css
@@ -133,6 +133,8 @@ header {
     display: flex;
     justify-content: space-between;
     align-items: center;
+    flex-wrap: wrap;
+    gap: 0.5rem;
     box-shadow: 0 2px 12px rgba(0,0,0,0.15);
     position: sticky;
     top: 0;
@@ -162,8 +164,16 @@ header {
 
 .header-right {
     display: flex;
-    gap: 0.75rem;
+    gap: 0.5rem;
     align-items: center;
+    flex-wrap: wrap;
+    justify-content: flex-end;
+}
+
+.header-right .btn-secondary,
+.header-right .btn-primary {
+    padding: 6px 12px;
+    font-size: 0.82rem;
 }
 
 .user-info {
@@ -1324,14 +1334,13 @@ span.empty {
 
 /* Company selector */
 .company-selector {
-    margin-left: 1.5rem;
-    padding: 6px 12px;
-    border: 2px solid #e0e0e0;
-    border-radius: 8px;
-    font-size: 0.88rem;
+    padding: 6px 10px;
+    border: 1px solid #d0d5dd;
+    border-radius: 6px;
+    font-size: 0.82rem;
     font-weight: 600;
     color: #0f3460;
-    background: #f8f9fb;
+    background: #fff;
     cursor: pointer;
     transition: border-color 0.2s;
 }