add validity and repository, update calculator UI view