Cleanups to the UI for the calculator and mixture-new views