merge to update display upon clicking calculate button

yaaaaay