rever to 28ebb0130d6a50bdc56f250a2dbddb1e0bba0668
got rid of calc button