Work on calculation page