diff --git a/.github/workflows/web-check.yml b/.github/workflows/web-check.yml
index 8b267c5..07c5a9e 100644
--- a/.github/workflows/web-check.yml
+++ b/.github/workflows/web-check.yml
@@ -3,7 +3,7 @@ name: Web Check
 permissions:
   contents: read
 
-on: ["push", "pull_request", "workflow_call"]
+on: ["pull_request", "workflow_call"]
 
 jobs:
   ci:
diff --git a/web/src/components/DeviceControl.tsx b/web/src/components/DeviceControl.tsx
index 38a7a51..0078da2 100644
--- a/web/src/components/DeviceControl.tsx
+++ b/web/src/components/DeviceControl.tsx
@@ -17,7 +17,7 @@ export default component$(() => {
 
   const sendCommand = $(async (command: string) => {
     if (!selectedAddress.value) {
-      message.value = 'Bitte zuerst ein Gerät auswählen';
+      message.value = 'Please select a device first';
       return;
     }
     const token = localStorage.getItem('ot_br_setup_token') ?? '';
@@ -27,9 +27,9 @@ export default component$(() => {
         address: selectedAddress.value,
         command,
       });
-      message.value = `"${command}" gesendet`;
+      message.value = `"${command}" sent to ${selectedAddress.value}`;
     } catch (e) {
-      message.value = e instanceof Error ? e.message : 'Fehler beim Senden';
+      message.value = e instanceof Error ? e.message : 'Failed to send command';
     } finally {
       sending.value = false;
     }
@@ -37,9 +37,9 @@ export default component$(() => {
 
   return (
     <div class="card">
-      <h2>Gerätesteuerung</h2>
+      <h2>Device control</h2>
       {neighbors.value.length === 0 ? (
-        <p class="muted">Keine Geräte im Netzwerk gefunden.</p>
+        <p class="muted">No devices found in the network.</p>
       ) : (
         <>
           <select
@@ -47,7 +47,7 @@ export default component$(() => {
               selectedAddress.value = (e.target as HTMLSelectElement).value;
             }}
           >
-            <option value="">Gerät wählen...</option>
+            <option value="">Select device...</option>
             {neighbors.value.map((n) => (
               <option
                 key={n.ext_mac}
@@ -62,21 +62,21 @@ export default component$(() => {
               onClick$={() => sendCommand('TOGGLE')}
               disabled={sending.value}
             >
-              Umschalten
+              Toggle
             </button>
             <button
               type="button"
               onClick$={() => sendCommand('LED_ON')}
               disabled={sending.value}
             >
-              An
+              On
             </button>
             <button
               type="button"
               onClick$={() => sendCommand('LED_OFF')}
               disabled={sending.value}
             >
-              Aus
+              Off
             </button>
           </div>
         </>
diff --git a/web/src/components/OtaBanner.tsx b/web/src/components/OtaBanner.tsx
index 12b49f6..41401de 100644
--- a/web/src/components/OtaBanner.tsx
+++ b/web/src/components/OtaBanner.tsx
@@ -49,6 +49,9 @@ export default component$(() => {
         !a.name.includes('partition'),
     );
     if (!asset) {
+      updateState.value = 'error';
+      lastError.value =
+        'Firmware is currently being built on GitHub - please try again in a few minutes.';
       return;
     }
 
@@ -103,6 +106,12 @@ export default component$(() => {
   const isNewer =
     latestRelease.value &&
     latestRelease.value.tag_name !== currentVersion.value;
+  const assetReady = latestRelease.value?.assets.some(
+    (a) =>
+      a.name.endsWith('.bin') &&
+      !a.name.includes('bootloader') &&
+      !a.name.includes('partition'),
+  );
 
   if (!isNewer && updateState.value === 'idle') {
     return null;
@@ -113,17 +122,22 @@ export default component$(() => {
       {isNewer && updateState.value === 'idle' && (
         <>
           <p>
-            Update verfügbar: <strong>{latestRelease.value?.tag_name}</strong>{' '}
-            (aktuell: {currentVersion.value})
+            Update is available:{' '}
+            <strong>{latestRelease.value?.tag_name}</strong> (current:{' '}
+            {currentVersion.value})
           </p>
-          <button type="button" onClick$={startUpdate}>
-            Jetzt aktualisieren
-          </button>
+          {assetReady ? (
+            <button type="button" onClick$={startUpdate}>
+              Update now
+            </button>
+          ) : (
+            <p class="muted">Firmware is still being built, please wait...</p>
+          )}
         </>
       )}
       {updateState.value === 'updating' && (
         <div>
-          <p>Update läuft... {progress.value}%</p>
+          <p>Update is running... {progress.value}%</p>
           <div class="progress-bar">
             <div
               class="progress-fill"
@@ -139,7 +153,7 @@ export default component$(() => {
         <div>
           <p class="error">Failed to update firmware: {lastError.value}</p>
           <button type="button" onClick$={startUpdate}>
-            Erneut versuchen
+            Retry
           </button>
         </div>
       )}