diff --git a/package.json b/package.json
index 422941b..7835ef8 100644
--- a/package.json
+++ b/package.json
@@ -34,10 +34,12 @@
     "@storybook/addon-svelte-csf": "^1.1.0",
     "@storybook/svelte": "^6.4.19",
     "@sveltejs/adapter-node": "^1.0.0-next.0",
+    "chota": "^0.8.0",
     "lodash": "^4.17.21",
     "redux": "^4.1.2",
     "reselect": "^4.1.5",
     "rollup-plugin-analyzer": "^4.0.0",
+    "svelte-chota": "^1.8.6",
     "svelte-knobby": "^0.3.4",
     "ts-action": "^11.0.0",
     "updux": "link:/home/yanick/work/javascript/updux-js/",
diff --git a/src/lib/components/ShipEdit/Carrier/Squadron.svelte b/src/lib/components/ShipEdit/Carrier/Squadron.svelte
index 6f46f46..4b17645 100644
--- a/src/lib/components/ShipEdit/Carrier/Squadron.svelte
+++ b/src/lib/components/ShipEdit/Carrier/Squadron.svelte
@@ -30,4 +30,7 @@ $: dispatch.setSquadronType({type, id});
 </script>
 
 <style>
+select {
+    width: inherit;
+}
 </style>
diff --git a/src/lib/components/ShipEdit/Carrier/index.svelte b/src/lib/components/ShipEdit/Carrier/index.svelte
index cb69ac8..53b8907 100644
--- a/src/lib/components/ShipEdit/Carrier/index.svelte
+++ b/src/lib/components/ShipEdit/Carrier/index.svelte
@@ -1,7 +1,7 @@
 <Section label="carrier">
   <ShipItem {...reqs}>
     <Field label="bays">
-      <input type="number" min="0" bind:value={bays} />
+      <input class="short" type="number" min="0" bind:value={bays} />
     </Field>
   </ShipItem>
 
diff --git a/src/lib/components/ShipEdit/Propulsion/Drive/index.svelte b/src/lib/components/ShipEdit/Propulsion/Drive/index.svelte
index a092b2d..75d8eef 100644
--- a/src/lib/components/ShipEdit/Propulsion/Drive/index.svelte
+++ b/src/lib/components/ShipEdit/Propulsion/Drive/index.svelte
@@ -1,7 +1,7 @@
 <ShipItem {...reqs}>
   <div>
     <Field label="thrust rating">
-      <input type="number" bind:value={rating} min="0" max="20" step="1" />
+      <input class="short" type="number" bind:value={rating} min="0" max="20" step="1" />
     </Field>
 
     <label><input type="checkbox" bind:checked={advanced} /> advanced</label>
diff --git a/src/lib/components/ShipEdit/ShipCost.svelte b/src/lib/components/ShipEdit/ShipCost.svelte
index 969b577..5589309 100644
--- a/src/lib/components/ShipEdit/ShipCost.svelte
+++ b/src/lib/components/ShipEdit/ShipCost.svelte
@@ -1,6 +1,6 @@
 <div class="mass">
     <Field label="ship tonnage">
-        <input bind:value={mass} type="number" min="10" max="300" />
+        <input class="short" bind:value={mass} type="number" min="10" max="300" />
         <span class="mass_symbol" />
 
         <div class="note" class:warning={!withinBudget}>
@@ -53,6 +53,7 @@
     }
     input {
         width: 5em;
+        display: inline !important;
     }
     .mass_symbol:after {
         content: url("/mass.svg");
@@ -74,7 +75,7 @@
     }
 
     .mass {
-        grid-column: 2;
+        width: 15em;
     }
     div.cost {
         grid-column: 3;
diff --git a/src/lib/components/ShipEdit/Structure/Armor.svelte b/src/lib/components/ShipEdit/Structure/Armor.svelte
index de581f2..b4a3a45 100644
--- a/src/lib/components/ShipEdit/Structure/Armor.svelte
+++ b/src/lib/components/ShipEdit/Structure/Armor.svelte
@@ -2,7 +2,7 @@
   <div>
     <div class="nbr_layers">
       <Field label="armour layers">
-        <input type="number" min="0" bind:value={nbr_layers} />
+        <input class="short" type="number" min="0" bind:value={nbr_layers} />
       </Field>
     </div>
 
diff --git a/src/lib/components/ShipEdit/Structure/Armor/Layer.svelte b/src/lib/components/ShipEdit/Structure/Armor/Layer.svelte
index b6dab9e..ec80415 100644
--- a/src/lib/components/ShipEdit/Structure/Armor/Layer.svelte
+++ b/src/lib/components/ShipEdit/Structure/Armor/Layer.svelte
@@ -1,5 +1,5 @@
 <Field label={`layer ${layer}`}>
-  <input type="number" min="0" bind:value={rating} />
+  <input class="short" type="number" min="0" bind:value={rating} />
 </Field>
 
 <script>
diff --git a/src/lib/components/ShipEdit/Structure/Cargo.svelte b/src/lib/components/ShipEdit/Structure/Cargo.svelte
index 6bb00eb..88f00cc 100644
--- a/src/lib/components/ShipEdit/Structure/Cargo.svelte
+++ b/src/lib/components/ShipEdit/Structure/Cargo.svelte
@@ -1,6 +1,6 @@
 <ShipItem {...reqs}>
   <Field label="cargo">
-    <input type="number" min="0" bind:value={space} />
+    <input class="short" type="number" min="0" bind:value={space} />
   </Field>
 </ShipItem>
 
diff --git a/src/lib/components/ShipEdit/Structure/Hull.svelte b/src/lib/components/ShipEdit/Structure/Hull.svelte
index 3f73838..69dca24 100644
--- a/src/lib/components/ShipEdit/Structure/Hull.svelte
+++ b/src/lib/components/ShipEdit/Structure/Hull.svelte
@@ -1,6 +1,6 @@
   <ShipItem {...reqs}>
     <Field label="hull">
-      <input bind:value={rating} type="number" {min} {max} />
+      <input class="short" bind:value={rating} type="number" {min} {max} />
     </Field>
   </ShipItem>
 
diff --git a/src/lib/components/ShipEdit/Structure/Screens.svelte b/src/lib/components/ShipEdit/Structure/Screens.svelte
index 57aad57..70831b0 100644
--- a/src/lib/components/ShipEdit/Structure/Screens.svelte
+++ b/src/lib/components/ShipEdit/Structure/Screens.svelte
@@ -1,11 +1,11 @@
 <ShipItem {...reqs}>
   <div>
     <Field label="screens">
-      <input type="number" bind:value={standard} min="0" />
+      <input class='short' type="number" bind:value={standard} min="0" />
     </Field>
 
     <Field label="advanced screens">
-      <input type="number" bind:value={advanced} min="0" />
+      <input class='short' type="number" bind:value={advanced} min="0" />
     </Field>
   </div>
 </ShipItem>
diff --git a/src/lib/components/ShipEdit/Weaponry/AddWeapon.svelte b/src/lib/components/ShipEdit/Weaponry/AddWeapon.svelte
index b84e43a..e72af04 100644
--- a/src/lib/components/ShipEdit/Weaponry/AddWeapon.svelte
+++ b/src/lib/components/ShipEdit/Weaponry/AddWeapon.svelte
@@ -5,7 +5,7 @@
         {/each}
   </select>
 
-  <button class="button small blue" on:click={addWeapon} >add weapon</button>
+  <button class="button small primary" on:click={addWeapon} >add weapon</button>
 </Field>
 
 <script>
@@ -20,3 +20,10 @@
 
   const addWeapon = () => ship.dispatch.addWeapon(type);
 </script>
+
+<style>
+select {
+    width: inherit;
+    display: inline-block;
+}
+</style>
diff --git a/src/lib/components/ShipEdit/Weaponry/Weapon/Beam/index.svelte b/src/lib/components/ShipEdit/Weaponry/Weapon/Beam/index.svelte
index 8e031d3..0ba11a7 100644
--- a/src/lib/components/ShipEdit/Weaponry/Weapon/Beam/index.svelte
+++ b/src/lib/components/ShipEdit/Weaponry/Weapon/Beam/index.svelte
@@ -53,7 +53,6 @@
 
 
     function setArcs(firstArc) {
-        console.log(firstArc);
         if (nbrArcs === "broadside") {
             arcs = broadside;
             return;
@@ -61,12 +60,10 @@
             let first_index = all_arcs.findIndex((arc) =>  arc === firstArc);
             if (first_index === -1) first_index = 0;
 
-        console.log({arcs, label:"before"});
-            arcs = _.range(nbrArcs).map(
-                (i) => all_arcs[(first_index + i) % all_arcs.length]
+            arcs = Array.from({length: nbrArcs}).map(
+                (_dummy,i) => all_arcs[(first_index + i) % all_arcs.length]
             );
         arcsCaches = arcs.join(',');
-        console.log({arcs, label:"after"});
     }
 
     $: if (arcs.length !== nbrArcs) setArcs(arcs[0]);
diff --git a/src/lib/style/index.css b/src/lib/style/index.css
index 2717525..8d3300d 100644
--- a/src/lib/style/index.css
+++ b/src/lib/style/index.css
@@ -2,3 +2,7 @@
   --main-font-family: "Dosis", -apple-system, BlinkMacSystemFont, "Segoe UI",
     Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
 }
+
+input.short {
+    width: 5em !important;
+}
diff --git a/src/lib/style/index.js b/src/lib/style/index.js
index 53d4749..86e7d49 100644
--- a/src/lib/style/index.js
+++ b/src/lib/style/index.js
@@ -1,4 +1,5 @@
 import "../../../static/fonts/faktos.css";
 import "../../../static/fonts/dosis/dosis.css";
 import "../../../static/global.css";
+import 'chota';
 import "./index.css";
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index 591acee..df71d56 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -3,10 +3,7 @@
 <script>
   import { setContext } from "svelte";
 
-
-  import "../../static/fonts/faktos.css";
-  import "../../static/fonts/dosis/dosis.css";
-  import "../../static/global.css";
+  import '$lib/style/index.js';
   import shipStore from "$lib/store/ship.js";
 
   import App from "$lib/components/App.svelte";
diff --git a/static/global.css b/static/global.css
index f3f5cd6..f168cee 100644
--- a/static/global.css
+++ b/static/global.css
@@ -79,24 +79,6 @@ input[type="range"] {
 	height: 0;
 }
 
-button {
-	color: #333;
-	background-color: #f4f4f4;
-	outline: none;
-}
-
-button:disabled {
-	color: #999;
-}
-
-button:not(:disabled):active {
-	background-color: #ddd;
-}
-
-button:focus {
-	border-color: #666;
-}
-
 /*  ---- inputs --- */
 
 input, select {