Changes to calculator UI.

#247