diff --git a/static/js/core/formater.js b/static/js/core/formater.js
new file mode 100644
index 00000000..3409d32d
--- /dev/null
+++ b/static/js/core/formater.js
@@ -0,0 +1,119 @@
+const shortVersionTime = 2;
+const longVersionTime = 3;
+const detailedVersionTime = 10;
+const shortNumber = 3;
+const detailedNumber = 9;
+const decimalSize = 3;
+const numberShortNames = [," K"," M"," G"," P"];
+const shortDate = 2;
+const longDate = 5;
+const dateDivisions = { name:[], value: []};
+
+const fillDateDivisions = () => {
+    const names = ["week","day","hour","minute","second","millisecond"];
+    const values = [7*24*3600*1000,24*3600*1000,3600*1000,60000,1000,1];
+    for (const cpt in names) {
+        dateDivisions.name.push(names[cpt]);
+        dateDivisions.value.push(values[cpt]);
+    }
+}
+export const formatNumber = (number) => {
+    const values = { short: [], long: [], detailed: []};
+    let newNumber;
+    let decimalNumber;
+    let numberLength;
+    if (isNumber(number)){
+        decimalNumber=0;
+        if (number.toString().includes(".")){
+            newNumber=number*10;
+            decimalNumber++;
+            while (newNumber.toString().includes(".")){
+                newNumber = newNumber *10;
+                decimalNumber ++;
+            }
+            if(decimalNumber <= decimalSize) {
+                numberLength = newNumber.toString().length-decimalNumber;
+            }
+            else {
+                newNumber=Math.round(newNumber/Math.pow(10,decimalNumber-decimalSize));//-1 pour avoir un nombre avec 1 chiffre apres la virgule et arrondir correctement
+                decimalNumber=decimalSize;
+                numberLength= newNumber.toString().length-decimalNumber;
+            }
+        }
+        else {
+            newNumber = number;
+            decimalNumber = 0;
+            numberLength = newNumber.toString().length;
+        }
+
+        (numberLength>shortNumber)? (
+            ((numberLength%shortNumber) === 0)?
+                values.short.push(Math.floor(newNumber/Math.pow(10,numberLength-shortNumber+decimalNumber)) + numberShortNames[(numberLength/3)-1]):
+                values.short.push(Math.round(newNumber/Math.pow(10,(numberLength+decimalNumber-shortNumber)))/Math.pow(10,shortNumber-numberLength%shortNumber)+numberShortNames[Math.floor((numberLength)/3)])
+        ) : values.short.push(Math.round(newNumber/Math.pow(10,-shortNumber+numberLength+decimalNumber))/Math.pow(10,shortNumber-numberLength));
+
+        let detailedFormat="";
+        let cpt = 0;
+        let numberTemp = newNumber/Math.pow(10,decimalNumber);
+        let stringTemp = numberTemp.toString();
+        if (decimalNumber!=0)
+            while (cpt<= decimalNumber){
+                cpt++;
+                detailedFormat=stringTemp[stringTemp.length-cpt]+detailedFormat;
+            }
+        numberTemp=Math.floor(numberTemp);
+
+        cpt = 0;
+        while (cpt<numberLength)
+        {
+            detailedFormat=numberTemp%1000 + ((cpt==0)?"":" ") +detailedFormat;
+            numberTemp=(numberTemp-(numberTemp%1000))/1000;
+            cpt=cpt+3;
+        }
+        values.detailed.push(detailedFormat);
+    }
+    return values;
+};
+
+const isNumber = (n) => {
+    return /^-?[\d.]+(?:e-?\d+)?$/.test(n);
+ };
+
+export const formatDate = (datetime) => {
+    const dateInput= document.getElementById("date");
+    const date = dateInput.value;
+    fillDateDivisions();
+    let now= new Date();
+    if (Math.abs(now - datetime)>1000) {
+        if (datetime>now) {
+            return  "in " +formatTime(datetime-now, shortDate);
+        }
+        else {
+            return formatTime(now-datetime,1)+" ago";
+        }
+    }
+    else {
+        return "Now";
+    }
+ }
+
+ const formatTime = (duration, size) => {
+      let stringDuration = "";
+      let cpt = 0;
+      let stringSize =0;
+      let currentNumberOfTimeUnit;
+      while( size>stringSize) {
+          currentNumberOfTimeUnit =Math.floor(duration/dateDivisions.value[cpt]);
+          stringDuration = stringDuration+
+          ((currentNumberOfTimeUnit>0)?
+              (currentNumberOfTimeUnit)+" "+dateDivisions.name[cpt]+
+              ((currentNumberOfTimeUnit>1)?"s "
+              :" ")
+          :"")
+          ;
+          (Math.floor(currentNumberOfTimeUnit)>0||stringSize>0)?stringSize++:cpt=cpt;
+          duration=duration-(currentNumberOfTimeUnit)*dateDivisions.value[cpt];
+          cpt++;
+      }
+      return stringDuration;
+ }
diff --git a/static/js/production.js b/static/js/production.js
index 32df3aa8..cc8b9a89 100644
--- a/static/js/production.js
+++ b/static/js/production.js
@@ -1,6 +1,7 @@
 import Dictionnary from './core/dictionnary.js';
 import App from './core/app.js';
 import resourcesData from './resources/resources.js';
+import {formatNumber, formatDate} from './core/formater.js';
 
 /** PRODUCTION **/
 export const getDensityVisualization = (density, picto) => Array((Math.ceil(density / 20) + 1)).join(picto);
@@ -30,9 +31,9 @@ const displayStorage = (planet, resource, displayLocation) => {
             ${(typeof planet.storage !== 'undefined' && planet.storage !== null) ? `
             <div class="storage">
                 <div class ="storage-status">
-                    <div class="current-amount" id="current-amount-${resource.name}">${planet.storage.resources[resourceKey]}
+                    <div class="current-amount" id="current-amount-${resource.name}">${formatNumber(planet.storage.resources[resourceKey]).short}
                     </div>
-                 / ${planet.storage.capacity}
+                 / ${formatNumber(planet.storage.capacity).short[0]}
                 </div>
                 <div class="storage-line">
                     <div class="storage-display ${resource.name}">
@@ -41,7 +42,7 @@ const displayStorage = (planet, resource, displayLocation) => {
                     </div>
                     <div id="full-capacity-time-${resource.name}">
                         ${(planet.storage.capacity - planet.storage.resources[resourceKey])===0?
-                        "Full" : "-" + Math.floor((planet.storage.capacity - planet.storage.resources[resourceKey]) /(resource.density*10)) +"h"+ (60- now.getMinutes())+"min"}
+                        "Full" : "-" + formatTime(new Date(now.getYear(), now.getMonth(),now.getDate(), now.getHours()+1+Math.floor((planet.storage.capacity - planet.storage.resources[resourceKey]) /(resource.density*10))))}
                     </div>
                 </div>
                 <div class="hourly-production">+${resource.density*10}/h