Made Calculator as part of second tab