Some cleanup on Summary page