diff --git a/app/client/components/SettingsDialog.js b/app/client/components/SettingsDialog.js
index d3440ce..7ada796 100644
--- a/app/client/components/SettingsDialog.js
+++ b/app/client/components/SettingsDialog.js
@@ -15,25 +15,19 @@ import { DASHBOARD_METRICS } from '../store/dashboardMetrics.js'
 export class DashboardActions extends AppElement {
   static styles = css`
     .metric-selector-feedback{
-      font-size: 0.4em;
+      font-size: 0.5em;
       padding-top: 8px;
     }
 
-    .metric-selector-feedback>div {
-      display: grid;
-      grid-template-columns: repeat(4,1fr);
-      grid-template-rows: repeat(2, max-content);
-      gap: 8px;
-    }
-
     .settings-dialog>div.metric-selector{
       display: grid;
-      grid-template-columns: repeat(4,max-content);
+      grid-template-columns: repeat(3,max-content);
       gap: 8px;
     }
 
     .settings-dialog>div>label{
       font-size: 0.6em;
+      width: fit-content;
     }
 
     input[type="checkbox"]{
@@ -43,6 +37,12 @@ export class DashboardActions extends AppElement {
       height: 1.5em;
     }
 
+    label>span {
+      cursor: pointer;
+      -webkit-user-select: none;
+      user-select: none;
+    }
+
     .icon {
       height: 1.6em;
     }
@@ -58,7 +58,7 @@ export class DashboardActions extends AppElement {
     }
 
     table, th, td {
-      font-size: 0.8em;
+      font-size: 0.9em;
       border: 1px solid white;
       border-collapse: collapse;
     }
@@ -86,7 +86,7 @@ export class DashboardActions extends AppElement {
   @property({ type: Object })
     config = {}
 
-  @queryAll('.metric-selector>input')
+  @queryAll('.metric-selector input')
     _inputs
 
   @query('input[name="showIcons"]')
@@ -119,8 +119,10 @@ export class DashboardActions extends AppElement {
       </table>
     </div>
     <p class="show-icons-selector">
-      <label for="actions">Show icons</label>
-      <input @change=${this.toggleIcons} name="showIcons" type="checkbox" />
+      <label>
+        <span>Show icons</span>
+        <input @change=${this.toggleIcons} name="showIcons" type="checkbox" />
+      </label>
     </p>
     </app-dialog>
   `
@@ -143,8 +145,9 @@ export class DashboardActions extends AppElement {
 
   renderAvailableMetricList () {
     return Object.keys(DASHBOARD_METRICS).map(key => html`
-      <label for=${key}>${DASHBOARD_METRICS[key].displayName}</label>
-      <input @change=${this.toggleCheck} name=${key} size=${DASHBOARD_METRICS[key].size} type="checkbox" />
+      <label>
+        <input @change=${this.toggleCheck} name=${key} size=${DASHBOARD_METRICS[key].size} type="checkbox" />
+      <span>${DASHBOARD_METRICS[key].displayName}</span></label>
     `)
   }
 
diff --git a/app/client/lib/helper.js b/app/client/lib/helper.js
index 1bca643..e4fab7c 100644
--- a/app/client/lib/helper.js
+++ b/app/client/lib/helper.js
@@ -61,7 +61,7 @@ export function formatDistance (value, showInMiles = false) {
   * @param decimalPlaces The number of decimal places to round to (default: 0).
 */
 export function formatNumber (value, decimalPlaces = 0) {
-  const decimal = decimalPlaces > 0 ? decimalPlaces * 10 : 1
+  const decimal = Math.pow(10, decimalPlaces)
   if (value === undefined || value === null || value === Infinity || isNaN(value) || value === 0) { return '--' }
 
   return Math.round(value * decimal) / decimal