Calculators now use info from servlet and side nav has been updated