diff --git a/core/client.js b/core/client.js
index 88e8feba..e8061e51 100644
--- a/core/client.js
+++ b/core/client.js
@@ -156,11 +156,11 @@ class TfNavigationElement extends LitElement {
 				<link type="text/css" rel="stylesheet" href="/static/w3.css" />
 				<select
 					@change=${this.set_active_identity}
-					class="w3-button w3-cyan w3-bar-item w3-right"
-					style="max-width: 25%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap"
+					class="w3-button w3-rest w3-cyan w3-bar-item w3-right"
+					style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap; max-width: 100%"
 				>
 					${this.identities.map(
-						(x) => html`<option ?selected=${x === this.identity}>${self.names[x]} - ${x}</option>`
+						(x) => html`<option ?selected=${x === this.identity}>${self.names[x]}${self.names[x] === x ? '' : html` - ${x}`}</option>`
 					)}
 				</select>
 			`;
@@ -170,7 +170,7 @@ class TfNavigationElement extends LitElement {
 				<button
 					id="create_identity"
 					@click=${this.create_identity}
-					class="w3-button w3-blue w3-right"
+					class="w3-button w3-mobile w3-blue w3-right"
 				>
 					Create an Identity
 				</button>