Updated calculator layout