Calculator design fixes.