Updated calculator form