Summary Screen rework in progress