Various Calculator Transition fixes and UI improvements