fixed #25 form popups for calculations