diff --git a/index.html b/index.html
index a6477cab..b38ab36c 100644
--- a/index.html
+++ b/index.html
@@ -3004,7 +3004,7 @@
     <div id="resourcesEditor" class="dialog stable" style="display: none">
       <div id="resourcesHeader" class="header">
         <div style="left:2.8em" data-tip="Click to sort by resource name" class="sortable alphabetically" data-sortby="name">Resource&nbsp;</div>
-        <div style="left:8.8em" data-tip="Click to sort by resource type" class="sortable alphabetically" data-sortby="type">Type&nbsp;</div>
+        <div style="left:8.8em" data-tip="Click to sort by resource category" class="sortable alphabetically" data-sortby="category">Category&nbsp;</div>
         <div style="left:14em" data-tip="Click to sort spread model" class="sortable alphabetically" data-sortby="model">Model&nbsp;</div>
         <div style="left:20em" data-tip="Click to sort by resource basic value" class="sortable" data-sortby="value">Value&nbsp;</div>
         <div style="left:23.6em" data-tip="Click to sort by generation chance" class="sortable" data-sortby="chance">Chance&nbsp;</div>
diff --git a/modules/ui/editors.js b/modules/ui/editors.js
index 815efaf8..a00c23da 100644
--- a/modules/ui/editors.js
+++ b/modules/ui/editors.js
@@ -331,6 +331,7 @@ function createPicker(hatching) {
   const closePicker = () => container.remove();
 
   const container = d3.select("body").append("svg").attr("id", "pickerContainer").attr("width", "100%").attr("height", "100%");
+  container.append("rect").attr("width", "100%").attr("height", "100%").attr("opacity", 0).on("mousemove", cl).on("click", closePicker);
   const picker = container.append("g").attr("id", "picker").call(d3.drag().filter(() => event.target.tagName !== "INPUT").on("start", dragPicker));
 
   const controls = picker.append("g").attr("id", "pickerControls");
diff --git a/modules/ui/resources-editor.js b/modules/ui/resources-editor.js
index a9ddaf84..9c1bfb76 100644
--- a/modules/ui/resources-editor.js
+++ b/modules/ui/resources-editor.js
@@ -28,17 +28,19 @@ function editResources() {
     // // {i: 33, name: "Saltpeter", icon: "resource-saltpeter", color: "#e6e3e3", value: 8, chance: 2, model: "habitability", bonus: {artillery: 3}}
     for (const r of pack.resources) {
       const stroke = Resources.getStroke(r.color);
-      lines += `<div class="states resources" data-id=${r.i} data-name="${r.name}" data-color="${r.color}" data-chance="${r.chance}" data-value="${r.value}" data-model="${r.model}" data-cells="${r.cells}">
+      lines += `<div class="states resources" data-id=${r.i} data-name="${r.name}" data-color="${r.color}"
+        data-category="${r.category}" data-chance="${r.chance}"
+        data-value="${r.value}" data-model="${r.model}" data-cells="${r.cells}">
         <svg data-tip="Resource icon. Click to change" width="2em" height="2em" class="icon">
           <circle cx="50%" cy="50%" r="42%" fill="${r.color}" stroke="${stroke}"/>
           <use href="#${r.icon}" x="10%" y="10%" width="80%" height="80%"/>
         </svg>
-        <input data-tip="Resource name. Click and type to change" class="resourceName" value="${r.name}" autocorrect="off" spellcheck="false">
-        <select data-tip="Resource type. Select to change" class="resourceType"><option selected>No data</option></select>
+        <input data-tip="Resource name. Click and category to change" class="resourceName" value="${r.name}" autocorrect="off" spellcheck="false">
+        <select data-tip="Resource category. Select to change"><option selected>No data</option></select>
         <input data-tip="Resource spread model. Select to change" value="${r.model}" class="model"/>
 
-        <input data-tip="Resource basic value. Click and type to change" value="${r.value}" type="number">
-        <input data-tip="Resource generation chance in eligible cell. Click and type to change" value="${r.chance}" type="number">
+        <input data-tip="Resource basic value. Click and type to change" value="${r.value}" type="number" min=0 max=100 step=1 />
+        <input data-tip="Resource generation chance in eligible cell. Click and type to change" value="${r.chance}" type="number" min=0 max=100 step=.1 />
         <div data-tip="Number of cells with resource" class="cells">${r.cells}</div>
 
         <span data-tip="Remove resource" class="icon-trash-empty hide"></span>
@@ -97,12 +99,12 @@ function editResources() {
   }
 
   function downloadResourcesData() {
-    let data = "Id,Resource,Type,Color,Icon,Value,Chance,Model,Cells\n"; // headers
+    let data = "Id,Resource,Category,Color,Icon,Value,Chance,Model,Cells\n"; // headers
 
     body.querySelectorAll(":scope > div").forEach(function(el) {
       data += el.dataset.id + ",";
       data += el.dataset.name + ",";
-      data += el.dataset.type + ",";
+      data += el.dataset.category + ",";
       data += el.dataset.color + ",";
       data += el.dataset.icon + ",";
       data += el.dataset.value + ",";