More work on calculation page