updated calculator and included user interface class