Frontend & Calc.js Update