Fixed calculator-ui