diff --git a/core/client.js b/core/client.js
index 702be90a..e587124d 100644
--- a/core/client.js
+++ b/core/client.js
@@ -124,7 +124,7 @@ class TfNavigationElement extends LitElement {
 			<style>
 				${k_global_style}
 			</style>
-			<div style="margin: 4px">
+			<div style="margin: 4px; display: flex; flex-direction: row; flex-wrap: nowrap; gap: 3px">
 				<span>😎</span>
 				<a accesskey="h" data-tip="Open home app." href="/" style="color: #fff">Tilde Friends</a>
 				<a accesskey="a" data-tip="Open apps list." href="/~core/apps/">apps</a>
@@ -133,9 +133,10 @@ class TfNavigationElement extends LitElement {
 				<span style="display: inline-block; vertical-align: top; white-space: pre; color: ${this.status.color ?? kErrorColor}">${this.status.message}</span>
 				<span id="requests"></span>
 				${this.render_permissions()}
-				<span>${Object.keys(this.spark_lines).sort().map(x => this.spark_lines[x]).map(x => [x.dataset.emoji, x])}</span>
+				<span style="flex: 0 0 1; white-space: nowrap; overflow: hidden; vertical-align: top">${Object.keys(this.spark_lines).sort().map(x => this.spark_lines[x]).map(x => [x.dataset.emoji, x])}</span>
 				<span id="permissions"></span>
-				<span style="float: right">${this.render_login()}</span>
+				<span style="flex: 1 0 0"></span>
+				<span style="flex: 0 0; white-space: nowrap">${this.render_login()}</span>
 			</div>
 		`;
 	}