Last commit before re-working calculator panel