Fix naming problem
Change the caculator layout