Hållut

Small changes to calculate button and associated methods.