big changes to calculator layout