Made Calculator Dynamic