calc and fonts updated