Updated calculator app using controller