diff --git a/static/js/app.js b/static/js/app.js
index 86feb64..f26ce8f 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -85,13 +85,13 @@ class PairingMethodPicker extends Component {
         return html`
             <label for="stacked-state">Pairing Method</label>
             <select id="stacked-state" onChange=${this.onChange} value=${props.pairing_method}>
-                <optgroup label="JD 2020 and later">
-                    <option value="${PairingMethod.DEFAULT}">Default: All platforms except Stadia</option>
-                    <option value="${PairingMethod.FAST}">Fast: Xbox One/PlayStation/Nintendo Switch</option>
-                    <option value="${PairingMethod.STADIA}">Stadia: for Stadia, obviously</option>
+                <optgroup label="Just Dance 2020 and later">
+                    <option value="${PairingMethod.DEFAULT}">Default (all, except Stadia)</option>
+                    <option value="${PairingMethod.FAST}">Fast (Xbox, PlayStation, Nintendo Switch)</option>
+                    <option value="${PairingMethod.STADIA}">Stadia</option>
                 </optgroup>
-                <optgroup label="JD 2016-2019">
-                    <option value="${PairingMethod.OLD}">Old: All platforms (incl. PC)</option>
+                <optgroup label="Just Dance 2016 to Just Dance 2019">
+                    <option value="${PairingMethod.OLD}">Old (all platforms, including PCs)</option>
                 </optgroup>
             </select>
         `
@@ -154,7 +154,7 @@ class PrivateIpAddress extends Component {
             </label>
 
             ${(pairing_method == PairingMethod.STADIA) && html`
-                <input readonly id="ipAddr" type="text" size="15" placeholder="Not Required" />
+                <input readonly id="ipAddr" type="text" size="15" placeholder="Not Required (${addr})" />
             `}
 
             ${(pairing_method == PairingMethod.DEFAULT && state.lock_host) && html`
@@ -193,7 +193,7 @@ class PairingCode extends Component {
         return html`
             <label>Pairing Code</label>
             ${[PairingMethod.DEFAULT, PairingMethod.STADIA].indexOf(pairing_method) > -1 && html`
-                <input required id="pairingCode" type="text" inputmode="decimal" value=${state.pairing_code} placeholder="000000" maxlength="6" size="6" pattern="[0-9]{6}" onKeyPress=${(e) => !/[0-9]/.test(e.key) && e.preventDefault()} onChange=${this.onChange} />
+                <input required id="pairingCode" type="number" inputmode="decimal" value=${state.pairing_code} placeholder="000000" maxlength="6" size="6" pattern="[0-9]{6}" onKeyPress=${(e) => !/[0-9]/.test(e.key) && e.preventDefault()} onChange=${this.onChange} />
             `}
             ${[PairingMethod.DEFAULT, PairingMethod.STADIA].indexOf(pairing_method) == -1 && html`
                 <input type="text" id="pairingCode" value="" readonly placeholder="Not Required" size="12" />