changed calc ui a bit